Add virtual layer encompassing groups of fences/cones, and remove the obsolete shapefiles.

2018-09-14 16:04:00 +02:00 · 2018-09-14 16:04:00 +02:00 · 2e21c7a719
parent 19a0588ba5
commit 2e21c7a719
19 changed files with 4640 additions and 5906 deletions
--- a/routes/Gun
+++ b/routes/Gun
--- a/Run.qgs.mldata
+++ b/Run.qgs.mldata
--- a/routes/Gun
+++ b/routes/Gun
--- a/routes/cones.cpg
+++ b/routes/cones.cpg
@ -1 +0,0 @@
-UTF-8
--- a/routes/cones.dbf
+++ b/routes/cones.dbf
--- a/routes/cones.prj
+++ b/routes/cones.prj
@ -1 +0,0 @@
-PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0]]
--- a/routes/cones.qpj
+++ b/routes/cones.qpj
@ -1 +0,0 @@
-PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],AUTHORITY["EPSG","3857"]]
--- a/routes/cones.shp
+++ b/routes/cones.shp
--- a/routes/cones.shx
+++ b/routes/cones.shx
--- a/routes/fencing
+++ b/routes/fencing
@ -1 +0,0 @@
-utf-8
--- a/routes/fencing
+++ b/routes/fencing
--- a/routes/fencing
+++ b/routes/fencing
@ -1 +0,0 @@
-PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0]]
--- a/routes/fencing
+++ b/routes/fencing
@ -1 +0,0 @@
-PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],AUTHORITY["EPSG","3857"]]
--- a/routes/fencing
+++ b/routes/fencing
--- a/routes/fencing
+++ b/routes/fencing
--- a/backgrounds.qpt
+++ b/backgrounds.qpt
@ -1,160 +0,0 @@
-<Composer title="Fencing Backgrounds" visible="1">
- <Composition resizeToContentsMarginLeft="0" snapping="0" showPages="1" guidesVisible="1" resizeToContentsMarginTop="0" worldFileMap="{39758247-5c8c-4d40-90f9-d968425f2429}" alignmentSnap="1" printResolution="300" paperWidth="297" gridVisible="0" snapGridOffsetX="0" smartGuides="1" snapGridOffsetY="0" resizeToContentsMarginRight="0" snapTolerancePixels="5" printAsRaster="0" generateWorldFile="1" paperHeight="210" numPages="1" snapGridResolution="10" resizeToContentsMarginBottom="0">
-  <symbol alpha="1" clip_to_extent="1" type="fill" name="">
-   <layer pass="0" class="SimpleFill" locked="0">
-    <prop k="border_width_map_unit_scale" v="0,0,0,0,0,0"/>
-    <prop k="color" v="255,255,255,255"/>
-    <prop k="joinstyle" v="miter"/>
-    <prop k="offset" v="0,0"/>
-    <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-    <prop k="offset_unit" v="MM"/>
-    <prop k="outline_color" v="0,0,0,255"/>
-    <prop k="outline_style" v="no"/>
-    <prop k="outline_width" v="0.26"/>
-    <prop k="outline_width_unit" v="MM"/>
-    <prop k="style" v="solid"/>
-   </layer>
-  </symbol>
-  <ComposerPicture resizeMode="0" svgBorderWidth="0.2" pictureRotation="19" pictureWidth="6.97293" svgFillColor="255,255,255,255" svgBorderColor="0,0,0,255" file="/usr/share/qgis/svg/arrows/NorthArrow_11.svg" pictureHeight="8.80189" mapId="0" anchorPoint="0">
-   <ComposerItem pagey="2" page="1" id="" lastValidViewScaleFactor="-1" positionMode="0" positionLock="false" x="286.027" y="2" visibility="1" zValue="4" background="false" transparency="0" frameJoinStyle="miter" blendMode="0" width="9.45865" outlineWidth="0.3" excludeFromExports="0" uuid="{0e4e1a71-9e4a-4942-8f32-b46dae34e12b}" height="11" itemRotation="0" frame="false" pagex="286.027">
-    <FrameColor alpha="255" red="0" blue="0" green="0"/>
-    <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
-    <dataDefinedSource expr="" field="" active="false" useExpr="true"/>
-    <customproperties/>
-   </ComposerItem>
-  </ComposerPicture>
-  <ComposerLabel valign="64" marginX="1" marginY="1" labelText="[%upper( &quot;area&quot; )%]" htmlState="0" halign="1">
-   <LabelFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style="Regular"/>
-   <FontColor red="0" blue="0" green="0"/>
-   <ComposerItem pagey="205.886" page="1" id="" lastValidViewScaleFactor="-1" positionMode="0" positionLock="false" x="285.027" y="205.886" visibility="1" zValue="3" background="false" transparency="0" frameJoinStyle="miter" blendMode="0" width="142.543" outlineWidth="0.3" excludeFromExports="0" uuid="{57e45e96-9574-495f-93e6-014f6737c26d}" height="10.3185" itemRotation="270" frame="false" pagex="285.027">
-    <FrameColor alpha="255" red="0" blue="0" green="0"/>
-    <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
-    <customproperties/>
-   </ComposerItem>
-  </ComposerLabel>
-  <ComposerScaleBar lineCapStyle="square" style="Single Box" numMapUnitsPerScaleBarUnit="1" segmentSizeMode="1" alignment="0" numSegments="4" segmentMillimeters="19.1657" lineJoinStyle="miter" minBarWidth="50" numUnitsPerSegment="100" units="1" labelBarSpace="3" outlineWidth="0.3" numSegmentsLeft="2" maxBarWidth="150" height="3" boxContentSpace="1" mapId="0" unitLabel="m">
-   <scaleBarFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
-   <fillColor alpha="255" red="0" blue="0" green="0"/>
-   <fillColor2 alpha="255" red="255" blue="255" green="255"/>
-   <strokeColor alpha="255" red="0" blue="0" green="0"/>
-   <textColor alpha="255" red="0" blue="0" green="0"/>
-   <ComposerItem pagey="189.669" page="1" id="" lastValidViewScaleFactor="-1" positionMode="0" positionLock="false" x="7" y="189.669" visibility="1" zValue="2" background="false" transparency="0" frameJoinStyle="miter" blendMode="0" width="109.429" outlineWidth="0.3" excludeFromExports="0" uuid="{4c7b8614-ae12-427c-b9ae-2054ac8cbea5}" height="16.2165" itemRotation="0" frame="false" pagex="7">
-    <FrameColor alpha="255" red="0" blue="0" green="0"/>
-    <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
-    <customproperties/>
-   </ComposerItem>
-  </ComposerScaleBar>
-  <ComposerMap followPreset="false" mapRotation="0" keepLayerSet="false" followPresetName="" id="0" previewMode="Cache" drawCanvasItems="true">
-   <Extent ymin="-4016466.86311593931168318" xmin="2048510.00142486742697656" ymax="-4015526.02756694285199046" xmax="2049960.64797807228751481"/>
-   <LayerSet/>
-   <Grid/>
-   <ComposerMapGrid rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" show="0" bottomAnnotationPosition="1" annotationPrecision="3" showAnnotation="0" topFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationDirection="0" topAnnotationPosition="1" rightAnnotationDisplay="3" offsetX="0" offsetY="0" rightFrameDivisions="0" gridStyle="0" annotationFontColor="0,0,0,255" intervalX="5" gridFrameSideFlags="15" intervalY="5" bottomAnnotationDirection="0" leftAnnotationDisplay="3" leftFrameDivisions="0" frameFillColor1="255,255,255,255" annotationExpression="" frameFillColor2="0,0,0,255" crossLength="3" gridFramePenThickness="0.5" bottomAnnotationDisplay="3" unit="1" topAnnotationDisplay="3" leftAnnotationPosition="1" blendMode="0" gridFrameStyle="0" rightAnnotationPosition="1" gridFrameWidth="2" name="Grid 1" annotationFormat="4" bottomFrameDivisions="0" topAnnotationDirection="0" frameAnnotationDistance="1">
-    <lineStyle>
-     <symbol alpha="1" clip_to_extent="1" type="line" name="">
-      <layer pass="0" class="SimpleLine" locked="0">
-       <prop k="capstyle" v="square"/>
-       <prop k="customdash" v="5;2"/>
-       <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
-       <prop k="customdash_unit" v="MM"/>
-       <prop k="draw_inside_polygon" v="0"/>
-       <prop k="joinstyle" v="bevel"/>
-       <prop k="line_color" v="195,195,195,255"/>
-       <prop k="line_style" v="solid"/>
-       <prop k="line_width" v="0"/>
-       <prop k="line_width_unit" v="MM"/>
-       <prop k="offset" v="0"/>
-       <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-       <prop k="offset_unit" v="MM"/>
-       <prop k="use_custom_dash" v="0"/>
-       <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
-      </layer>
-     </symbol>
-    </lineStyle>
-    <markerStyle>
-     <symbol alpha="1" clip_to_extent="1" type="marker" name="">
-      <layer pass="0" class="SimpleMarker" locked="0">
-       <prop k="angle" v="0"/>
-       <prop k="color" v="0,0,0,255"/>
-       <prop k="horizontal_anchor_point" v="1"/>
-       <prop k="joinstyle" v="bevel"/>
-       <prop k="name" v="circle"/>
-       <prop k="offset" v="0,0"/>
-       <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
-       <prop k="offset_unit" v="MM"/>
-       <prop k="outline_color" v="0,0,0,255"/>
-       <prop k="outline_style" v="solid"/>
-       <prop k="outline_width" v="0"/>
-       <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
-       <prop k="outline_width_unit" v="MM"/>
-       <prop k="scale_method" v="diameter"/>
-       <prop k="size" v="2"/>
-       <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
-       <prop k="size_unit" v="MM"/>
-       <prop k="vertical_anchor_point" v="1"/>
-      </layer>
-     </symbol>
-    </markerStyle>
-    <spatialrefsys>
-     <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs</proj4>
-     <srsid>3857</srsid>
-     <srid>3857</srid>
-     <authid>EPSG:3857</authid>
-     <description>WGS 84 / Pseudo Mercator</description>
-     <projectionacronym>merc</projectionacronym>
-     <ellipsoidacronym>WGS84</ellipsoidacronym>
-     <geographicflag>false</geographicflag>
-    </spatialrefsys>
-    <annotationFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
-   </ComposerMapGrid>
-   <AtlasMap scalingMode="2" atlasDriven="1" margin="0.05"/>
-   <ComposerItem pagey="5.5" page="1" id="" lastValidViewScaleFactor="1.80526" positionMode="0" positionLock="false" x="7" y="5.5" visibility="1" zValue="1" background="false" transparency="0" frameJoinStyle="miter" blendMode="0" width="278.027" outlineWidth="0.3" excludeFromExports="0" uuid="{39758247-5c8c-4d40-90f9-d968425f2429}" height="180.318" itemRotation="0" frame="false" pagex="7">
-    <FrameColor alpha="255" red="0" blue="0" green="0"/>
-    <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
-    <dataDefinedRotation expr="" field="angle" active="false" useExpr="false"/>
-    <dataDefinedMapRotation expr="" field="angle" active="true" useExpr="false"/>
-    <customproperties/>
-   </ComposerItem>
-  </ComposerMap>
-  <ComposerAttributeTableV2 source="0" showGrid="1" maxFeatures="30" resizeMode="0" filterFeatures="false" featureFilter="" emptyTableMode="0" wrapString="" wrapBehaviour="0" headerMode="0" backgroundColor="255,255,255,255" showEmptyRows="0" emptyTableMessage="" showOnlyVisibleFeatures="0" vectorLayer="fencing_areas_shp20160923154231554" composerMap="0" headerHAlignment="0" contentFontColor="0,0,0,255" headerFontColor="0,0,0,255" cellMargin="1" filterToAtlasIntersection="0" relationId="" gridStrokeWidth="0.5" gridColor="0,0,0,255" showUniqueRowsOnly="0">
-   <headerFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
-   <contentFontProperties description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
-   <displayColumns>
-    <column width="0" vAlignment="128" attribute="id" sortByRank="0" hAlignment="1" heading="id" sortOrder="0">
-     <backgroundColor alpha="0" red="0" blue="0" green="0"/>
-    </column>
-    <column width="0" vAlignment="128" attribute="area" sortByRank="0" hAlignment="1" heading="area" sortOrder="0">
-     <backgroundColor alpha="0" red="0" blue="0" green="0"/>
-    </column>
-    <column width="0" vAlignment="128" attribute="angle" sortByRank="0" hAlignment="1" heading="angle" sortOrder="0">
-     <backgroundColor alpha="0" red="0" blue="0" green="0"/>
-    </column>
-   </displayColumns>
-   <cellStyles>
-    <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-    <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-    <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-    <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-    <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-    <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-    <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-    <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-    <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-   </cellStyles>
-   <customproperties/>
-  </ComposerAttributeTableV2>
-  <customproperties>
-   <property key="imageCropMarginBottom" value="0"/>
-   <property key="imageCropMarginLeft" value="0"/>
-   <property key="imageCropMarginRight" value="0"/>
-   <property key="imageCropMarginTop" value="0"/>
-   <property key="imageCropToContents" value="false"/>
-   <property key="svgCropMarginBottom" value="0"/>
-   <property key="svgCropMarginLeft" value="0"/>
-   <property key="svgCropMarginRight" value="0"/>
-   <property key="svgCropMarginTop" value="0"/>
-   <property key="svgCropToContents" value="false"/>
-   <property key="svgGroupLayers" value="false"/>
-  </customproperties>
- </Composition>
- <Atlas hideCoverage="true" coverageLayer="fencing_areas_shp20160923154231554" singleFile="false" filenamePattern="'output_'||@atlas_featurenumber" enabled="true" filterFeatures="false" sortFeatures="true" pageNameExpression="&quot;area&quot;" sortKey="id" sortAscending="true"/>
-</Composer>
--- a/routes/fencing.dbf
+++ b/routes/fencing.dbf
--- a/routes/fencing.shp
+++ b/routes/fencing.shp
--- a/routes/fencing.shx
+++ b/routes/fencing.shx
				`@ -1 +0,0 @@`
				`PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0]]`
				`@ -1 +0,0 @@`
				PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],AUTHORITY["EPSG","3857"]]