Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to work with new QGIS QML Structures #569

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Update to work with new QGIS QML Structures #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
885695b
testing: transform qml testing files with qgis to LTR 2.28
May 17, 2023
61a2a57
fix: write Option tags instead of props
May 17, 2023
2fcb85d
fix: nest Option tags in parent Option of type Map
OSHistory May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions data/qmls/line_simple.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,41 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis>
<qgis styleCategories="Symbology">
<renderer-v2 type="RuleRenderer">
<rules key="renderer_rules">
<rule key="renderer_rule_0" symbol="0" label="QGIS Simple Symbol"/>
</rules>
<symbols>
<symbol type="line" name="0">
<layer class="SimpleLine">
<prop k="line_color" v="255,0,255,255"/>
<prop k="offset" v="2"/>
<prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
<prop k="offset_unit" v="Pixel"/>
<prop k="joinstyle" v="round"/>
<prop k="capstyle" v="square"/>
<prop k="line_width" v="3"/>
<prop k="line_width_unit" v="Pixel"/>
<prop k="customdash" v="12;12"/>
<Option type="Map">
<Option value="0" name="align_dash_pattern"/>
<Option value="square" name="capstyle"/>
<Option value="12;12" name="customdash"/>
<Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
<Option value="MM" name="customdash_unit"/>
<Option value="0" name="dash_pattern_offset"/>
<Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
<Option value="MM" name="dash_pattern_offset_unit"/>
<Option value="0" name="draw_inside_polygon"/>
<Option value="round" name="joinstyle"/>
<Option value="255,0,255,255" name="line_color"/>
<Option value="solid" name="line_style"/>
<Option value="3" name="line_width"/>
<Option value="Pixel" name="line_width_unit"/>
<Option value="2" name="offset"/>
<Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
<Option value="Pixel" name="offset_unit"/>
<Option value="0" name="ring_filter"/>
<Option value="0" name="trim_distance_end"/>
<Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
<Option value="MM" name="trim_distance_end_unit"/>
<Option value="0" name="trim_distance_start"/>
<Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
<Option value="MM" name="trim_distance_start_unit"/>
<Option value="0" name="tweak_dash_pattern_on_corners"/>
<Option value="0" name="use_custom_dash"/>
<Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
</Option>
</layer>
</symbol>
</symbols>
Expand Down
7 changes: 5 additions & 2 deletions data/qmls/no_symbolizer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis>
<renderer-v2 type="nullSymbol"/>
<qgis styleCategories="Symbology" version="3.28.4-Firenze">
<renderer-v2 type="nullSymbol" referencescale="-1" enableorderby="0" forceraster="0" symbollevels="0"/>
<blendMode>0</blendMode>
<featureBlendMode>0</featureBlendMode>
<layerGeometryType>1</layerGeometryType>
</qgis>
286 changes: 169 additions & 117 deletions data/qmls/point_categories.qml
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 42 additions & 11 deletions data/qmls/point_external_graphic.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,51 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis>
<renderer-v2 type="RuleRenderer">
<qgis styleCategories="Symbology" version="3.28.4-Firenze">
<renderer-v2 type="RuleRenderer" referencescale="-1" enableorderby="0" forceraster="0" symbollevels="0">
<rules key="renderer_rules">
<rule key="renderer_rule_0" symbol="0" label="QGIS Simple Symbol"/>
<rule key="renderer_rule_0" label="QGIS Simple Symbol" symbol="0"/>
</rules>
<symbols>
<symbol type="marker" name="0">
<layer class="SvgMarker">
<prop k="angle" v="0"/>
<prop k="color" v="125,139,143,255"/>
<prop k="name" v="https://upload.wikimedia.org/wikipedia/commons/6/67/OpenLayers_logo.svg"/>
<prop k="size" v="69"/>
<prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
<prop k="size_unit" v="Pixel"/>
<symbol clip_to_extent="1" type="marker" alpha="1" frame_rate="10" name="0" force_rhr="0" is_animated="0">
<data_defined_properties>
<Option type="Map">
<Option type="QString" value="" name="name"/>
<Option name="properties"/>
<Option type="QString" value="collection" name="type"/>
</Option>
</data_defined_properties>
<layer class="SvgMarker" enabled="1" locked="0" pass="0">
<Option type="Map">
<Option type="QString" value="0" name="angle"/>
<Option type="QString" value="125,139,143,255" name="color"/>
<Option type="QString" value="0" name="fixedAspectRatio"/>
<Option type="QString" value="1" name="horizontal_anchor_point"/>
<Option type="QString" value="https://upload.wikimedia.org/wikipedia/commons/6/67/OpenLayers_logo.svg" name="name"/>
<Option type="QString" value="0,0" name="offset"/>
<Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
<Option type="QString" value="MM" name="offset_unit"/>
<Option type="QString" value="35,35,35,255" name="outline_color"/>
<Option type="QString" value="0.2" name="outline_width"/>
<Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
<Option type="QString" value="MM" name="outline_width_unit"/>
<Option name="parameters"/>
<Option type="QString" value="diameter" name="scale_method"/>
<Option type="QString" value="69" name="size"/>
<Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
<Option type="QString" value="Pixel" name="size_unit"/>
<Option type="QString" value="1" name="vertical_anchor_point"/>
</Option>
<data_defined_properties>
<Option type="Map">
<Option type="QString" value="" name="name"/>
<Option name="properties"/>
<Option type="QString" value="collection" name="type"/>
</Option>
</data_defined_properties>
</layer>
</symbol>
</symbols>
</renderer-v2>
<blendMode>0</blendMode>
<featureBlendMode>0</featureBlendMode>
<layerGeometryType>0</layerGeometryType>
</qgis>
17 changes: 5 additions & 12 deletions data/qmls/point_label.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis>
<renderer-v2 type="nullSymbol"/>
<labeling type="rule-based">
<rules key="labeling_rules">
<rule key="labeling_rule_0" filter="value > 0.1">
<settings>
<text-style fontSize="10" fontLetterSpacing="0" multilineHeight="1" textColor="0,0,0,255" fontFamily="Sans Serif" fieldName="locality_name"/>
<placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="13" yOffset="37" rotationAngle="0"/>
</settings>
</rule>
</rules>
</labeling>
<qgis styleCategories="Symbology" version="3.28.4-Firenze">
<renderer-v2 type="nullSymbol" referencescale="-1" enableorderby="0" forceraster="0" symbollevels="0"/>
<blendMode>0</blendMode>
<featureBlendMode>0</featureBlendMode>
<layerGeometryType>0</layerGeometryType>
</qgis>
100 changes: 72 additions & 28 deletions data/qmls/point_multiple_symbols.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,82 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis>
<renderer-v2 type="RuleRenderer">
<qgis styleCategories="Symbology" version="3.28.4-Firenze">
<renderer-v2 type="RuleRenderer" referencescale="-1" enableorderby="0" forceraster="0" symbollevels="0">
<rules key="renderer_rules">
<rule key="renderer_rule_0" symbol="0" label="QGIS Simple Symbol"/>
<rule key="renderer_rule_0" label="QGIS Simple Symbol" symbol="0"/>
</rules>
<symbols>
<symbol type="marker" name="0">
<layer class="SimpleMarker">
<prop k="angle" v="0"/>
<prop k="color" v="75,255,126,255"/>
<prop k="name" v="square"/>
<prop k="outline_color" v="0,0,0,255"/>
<prop k="outline_style" v="solid"/>
<prop k="outline_width" v="1"/>
<prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
<prop k="outline_width_unit" v="Pixel"/>
<prop k="size" v="24"/>
<prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
<prop k="size_unit" v="Pixel"/>
<symbol clip_to_extent="1" type="marker" alpha="1" frame_rate="10" name="0" force_rhr="0" is_animated="0">
<data_defined_properties>
<Option type="Map">
<Option type="QString" value="" name="name"/>
<Option name="properties"/>
<Option type="QString" value="collection" name="type"/>
</Option>
</data_defined_properties>
<layer class="SimpleMarker" enabled="1" locked="0" pass="0">
<Option type="Map">
<Option type="QString" value="0" name="angle"/>
<Option type="QString" value="square" name="cap_style"/>
<Option type="QString" value="75,255,126,255" name="color"/>
<Option type="QString" value="1" name="horizontal_anchor_point"/>
<Option type="QString" value="bevel" name="joinstyle"/>
<Option type="QString" value="square" name="name"/>
<Option type="QString" value="0,0" name="offset"/>
<Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
<Option type="QString" value="MM" name="offset_unit"/>
<Option type="QString" value="0,0,0,255" name="outline_color"/>
<Option type="QString" value="solid" name="outline_style"/>
<Option type="QString" value="1" name="outline_width"/>
<Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
<Option type="QString" value="Pixel" name="outline_width_unit"/>
<Option type="QString" value="diameter" name="scale_method"/>
<Option type="QString" value="24" name="size"/>
<Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
<Option type="QString" value="Pixel" name="size_unit"/>
<Option type="QString" value="1" name="vertical_anchor_point"/>
</Option>
<data_defined_properties>
<Option type="Map">
<Option type="QString" value="" name="name"/>
<Option name="properties"/>
<Option type="QString" value="collection" name="type"/>
</Option>
</data_defined_properties>
</layer>
<layer class="SimpleMarker">
<prop k="angle" v="0"/>
<prop k="color" v="255,0,0,255"/>
<prop k="name" v="circle"/>
<prop k="outline_color" v="35,35,35,255"/>
<prop k="outline_style" v="solid"/>
<prop k="outline_width" v="0"/>
<prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
<prop k="outline_width_unit" v="Pixel"/>
<prop k="size" v="4"/>
<prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
<prop k="size_unit" v="Pixel"/>
<layer class="SimpleMarker" enabled="1" locked="0" pass="0">
<Option type="Map">
<Option type="QString" value="0" name="angle"/>
<Option type="QString" value="square" name="cap_style"/>
<Option type="QString" value="255,0,0,255" name="color"/>
<Option type="QString" value="1" name="horizontal_anchor_point"/>
<Option type="QString" value="bevel" name="joinstyle"/>
<Option type="QString" value="circle" name="name"/>
<Option type="QString" value="0,0" name="offset"/>
<Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
<Option type="QString" value="MM" name="offset_unit"/>
<Option type="QString" value="35,35,35,255" name="outline_color"/>
<Option type="QString" value="solid" name="outline_style"/>
<Option type="QString" value="0" name="outline_width"/>
<Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
<Option type="QString" value="Pixel" name="outline_width_unit"/>
<Option type="QString" value="diameter" name="scale_method"/>
<Option type="QString" value="4" name="size"/>
<Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
<Option type="QString" value="Pixel" name="size_unit"/>
<Option type="QString" value="1" name="vertical_anchor_point"/>
</Option>
<data_defined_properties>
<Option type="Map">
<Option type="QString" value="" name="name"/>
<Option name="properties"/>
<Option type="QString" value="collection" name="type"/>
</Option>
</data_defined_properties>
</layer>
</symbol>
</symbols>
</renderer-v2>
<blendMode>0</blendMode>
<featureBlendMode>0</featureBlendMode>
<layerGeometryType>0</layerGeometryType>
</qgis>
Loading
Loading