More work on roads and mappings

Author: aaime

Diff for: ScaleRanges.ods

@@ -29,7 +29,7 @@
     <queueType>UNBOUNDED</queueType>
     <imageIOCacheThreshold>10240</imageIOCacheThreshold>
   </coverageAccess>
-  <updateSequence>625</updateSequence>
+  <updateSequence>862</updateSequence>
   <featureTypeCacheSize>0</featureTypeCacheSize>
   <globalServices>true</globalServices>
   <xmlPostRequestLogBufferSize>1024</xmlPostRequestLogBufferSize>

Diff for: global.xml

@@ -15,12 +15,6 @@
     <published type="layer">
       <id>LayerInfoImpl--547a051d:15a999429a2:-7ffe</id>
     </published>
-    <published type="layer">
-      <id>LayerInfoImpl-631386fb:15abe1cc787:-7ffd</id>
-    </published>
-    <published type="layer">
-      <id>LayerInfoImpl--195a4656:15bc41928c1:-7ea7</id>
-    </published>
     <published type="layer">
       <id>LayerInfoImpl--3366d757:15a9a13cea5:-7feb</id>
     </published>
@@ -33,6 +27,12 @@
     <published type="layer">
       <id>LayerInfoImpl--7bb5548c:15abdfdff2c:-7f1c</id>
     </published>
+    <published type="layer">
+      <id>LayerInfoImpl-631386fb:15abe1cc787:-7ffd</id>
+    </published>
+    <published type="layer">
+      <id>LayerInfoImpl--195a4656:15bc41928c1:-7ea7</id>
+    </published>
     <published type="layer">
       <id>LayerInfoImpl--3afbe93:15a98fb383b:-7ff3</id>
     </published>
@@ -42,6 +42,12 @@
     <published type="layer">
       <id>LayerInfoImpl--7d0bbe0a:15b95bcc902:-7ffc</id>
     </published>
+    <published type="layer">
+      <id>LayerInfoImpl--4e88ab2d:15cba2fcee0:-7ffd</id>
+    </published>
+    <published type="layer">
+      <id>LayerInfoImpl--4e88ab2d:15cba2fcee0:-7ff9</id>
+    </published>
   </publishables>
   <styles>
     <style/>
@@ -57,6 +63,8 @@
     <style/>
     <style/>
     <style/>
+    <style/>
+    <style/>
   </styles>
   <bounds>
     <minx>-2.0037508342789244E7</minx>
@@ -65,4 +73,8 @@
     <maxy>2.0048966104014594E7</maxy>
     <crs class="projected">EPSG:3857</crs>
   </bounds>
+  <attribution>
+    <logoWidth>0</logoWidth>
+    <logoHeight>0</logoHeight>
+  </attribution>
 </layerGroup>

Diff for: layergroups/osm.xml

@@ -1,2 +1,4 @@
 /geoserver.log
 /geoserver.log.1
+/geoserver.log.2
+/geoserver.log.3

Diff for: logs/.gitignore

@@ -177,6 +177,12 @@ tables:
       type: string
     - name: type
       type: mapping_value
+    - key: amenity
+      name: amenity
+      type: string
+    - key: aeroway
+      name: aeroway
+      type: string
     mapping:
       building:
       - __any__
@@ -246,6 +252,12 @@ tables:
     - key: religion
       name: religion
       type: string
+    - name: area
+      type: pseudoarea
+      key: null
+    - key: layer
+      name: layer
+      type: integer
     - args:
         values:
         - land
@@ -457,8 +469,13 @@ tables:
       type: id
     - name: geometry
       type: geometry
+    - name: class
+      type: mapping_key
     - name: type
       type: mapping_value
+    - key: highway
+      name: highway
+      type: string
     - key: name
       name: name
       type: string
@@ -483,8 +500,18 @@ tables:
     - key: service
       name: service
       type: string
-    - name: class
-      type: mapping_key
+    - key: horse
+      name: horse
+      type: string
+    - key: bicycle
+      name: bicycle
+      type: string
+    - key: construction
+      name: construction
+      type: string
+    - key: surface
+      name: surface
+      type: string
     filters:
       exclude_tags:
       - - area
@@ -528,6 +555,8 @@ tables:
           - unclassified
           - residential
           - raceway
+          - platform
+          - construction
           man_made:
           - pier
           - groyne

Diff for: osm/mapping.yml

@@ -2,8 +2,9 @@
 [type = 'administrative'] {
   [admin_level <= 4],[admin_level = 5 or admin_level = 6][@scale <= 400000],[admin_level = 7 or admin_level = 8][@scale <= 200000],[admin_level = 9 or admin_level = 10][@scale <= 100000] {
     stroke: #ac46ac;
-    composite-base: true;
-    composite: darken;
+    /* TODO: debug what's going on with composite here, it's affecting higher layers too */
+    /* composite-base: true; */
+    /* composite: darken; */
     stroke-opacity: 0.4;
 
     [admin_level = 2] {

Diff for: styles/admin_borders.css

@@ -1965,9 +1965,7 @@
             </sld:Stroke>
           </sld:LineSymbolizer>
         </sld:Rule>
-        <sld:VendorOption name="composite">darken</sld:VendorOption>
         <sld:VendorOption name="ruleEvaluation">first</sld:VendorOption>
-        <sld:VendorOption name="composite-base">true</sld:VendorOption>
       </sld:FeatureTypeStyle>
     </sld:UserStyle>
   </sld:NamedLayer>

Diff for: styles/admin_borders.sld

@@ -0,0 +1,22 @@
+/* @title gold polygon */
+[@sd < 100k] {
+  fill: darken(#d9d0c9, 4%);
+  [@sd < 25k] {
+    fill: #d9d0c9;
+    stroke: darken(#d9d0c9, 15%);
+  };
+  [aeroway = 'terminal'] {
+    fill: #cc99ff;
+    [@sd < 25k] {
+      stroke: darken(#cc99ff,15%);
+    };
+  };
+  [amenity = 'place_of_worship'],[building = 'train_station'] {
+    fill: darken(#d9d0c9, 20%);
+    [@sd < 25k] {
+      stroke-width: 0.75;
+      stroke:  darken(darken(#d9d0c9, 25%), 25%)
+    }
+
+  }
+}