separated sk/pl shading and masked out other relief features

FreemapSlovakia · Jul 26, 2022 · ce84040 · ce84040
1 parent f077c1b
commit ce84040
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/shading-scripts/Makefile b/shading-scripts/Makefile
@@ -281,6 +281,7 @@ build/final.tif.ovr: build/final.tif
 # gdaldem hillshade -alg Horn -z 1.5 -co JPEG_QUALITY=95 -co COMPRESS=JPEG -co NUM_THREADS=24 -co TILED=YES -co BIGTIFF=YES pl-warped.tif pl-hs.tif
 # gdalbuildvrt sh.vrt -r nearest pl-hs.tif sk-hs.tif
 # gdal2tiles.py -r near -z 17 --xyz --processes=$(getconf _NPROCESSORS_ONLN) -n -w none sh.vrt sh
+# find -type d | parallel -j 24 mogrify -format jpg '{}/*.png'
 
 
 # SI:
@@ -306,3 +307,4 @@ wget -i ./slovenia/urls
 pdal pipeline ./slovenia/pdal_dtm.json
 whitebox_tools -r=FeaturePreservingSmoothing --dem=GK_535_153_filled.tif --num_iter=3 --norm_diff=30 --filter=11 -o=./GK_535_153_smooth.tif --wd=.
 python /usr/lib/python3/dist-packages/osgeo_utils/gdal_edit.py -a_srs EPSG:3794 GK_535_153_filled.tif
+
diff --git a/style/index.js b/style/index.js
@@ -353,17 +353,17 @@ function generateFreemapStyle({
         .lineSymbolizer({ stroke: colors.areaLabel, strokeWidth: 1 })
       .typesRule(14, 'earth_bank')
         .linePatternSymbolizer({ file: 'images/earth_bank.svg' })
-    .style('feature_lines')
-      .typesRule(16, 'weir')
-        .lineSymbolizer({ stroke: hsl(0, 0, 40), strokeWidth: 3, strokeDasharray: '9, 3' })
-      .typesRule(16, 'dam')
-        .lineSymbolizer({ stroke: hsl(0, 0, 40), strokeWidth: 3 })
       .typesRule(16, 'dyke')
         .linePatternSymbolizer({ file: 'images/dyke.svg' })
       .typesRule(16, 'embankment')
         .linePatternSymbolizer({ file: 'images/embankment-half.svg' })
       .typesRule(16, 'gully')
         .linePatternSymbolizer({ file: 'images/gully.svg' })
+    .style('feature_lines')
+      .typesRule(16, 'weir')
+        .lineSymbolizer({ stroke: hsl(0, 0, 40), strokeWidth: 3, strokeDasharray: '9, 3' })
+      .typesRule(16, 'dam')
+        .lineSymbolizer({ stroke: hsl(0, 0, 40), strokeWidth: 3 })
       .typesRule(13, 'line')
         .lineSymbolizer({ stroke: 'black', strokeWidth: 1, strokeOpacity: 0.5 })
       .typesRule(14, 'minor_line')
@@ -376,7 +376,7 @@ function generateFreemapStyle({
       })
     .style('embankments')
       .rule({})
-        .linePatternSymbolizer({ file: 'images/embankment.svg' })
+        .linePatternSymbolizer({ file: 'images/embankment.svg' }) // TODO don't render on hi-res hillshading
     .style('mask') // hillshading helper for mask
       .rule()
         .rasterSymbolizer({ scaling: 'bilinear', opacity: 1.00 })

diff --git a/style/layers.js b/style/layers.js
@@ -485,6 +485,15 @@ function layers(shading, contours, hikingTrails, bicycleTrails, skiTrails, horse
               { compOp: 'dst-out' },
             );
 
+            layer(
+              'mask',
+              {
+                type: 'gdal',
+                file: 'shading/pl/mask.tif',
+              },
+              { compOp: 'dst-out' },
+            );
+
             // AT / CH is not so detailed
             // layer(
             //   'mask',
@@ -614,6 +623,8 @@ function layers(shading, contours, hikingTrails, bicycleTrails, skiTrails, horse
 
         addShadingAndContours('si', []);
 
+        addShadingAndContours('pl', ['sk']);
+
         addShadingAndContours('sk', []);
 
         map.layer(
@@ -626,7 +637,7 @@ function layers(shading, contours, hikingTrails, bicycleTrails, skiTrails, horse
           ({ layer }) => {
             // to cut out detailed
 
-            for (const cc of ['it', 'at', 'ch', 'si', 'sk']) {
+            for (const cc of ['it', 'at', 'ch', 'si', 'pl', 'sk']) {
               layer(
                 'mask',
                 {