fix: improve label placement for ecograms

geops · Jul 6, 2020 · 0201350 · 0201350
1 parent 13c0dcc
commit 0201350
Show file tree

Hide file tree

Showing 15 changed files with 973 additions and 496 deletions.
diff --git a/lib/data/ecograms.json b/lib/data/ecograms.json
diff --git a/lib/data/nais/ecogram.js b/lib/data/nais/ecogram.js
@@ -80,7 +80,8 @@ const aggregateEcograms = () => {
         w: Math.round(x2 * 1000 - x1 * 1000), // width
         h: Math.round(height),
         r: parseInt(f.properties.rows, 10),
-        o: parseFloat(f.properties.offset),
+        ox: parseFloat(f.properties.offsetX),
+        oy: parseFloat(f.properties.offsetY),
         z: parseInt(f.properties.z, 10), // z-index
         f: ft,
       });

diff --git a/lib/data/nais/ecogram/11.geojson b/lib/data/nais/ecogram/11.geojson
@@ -269,7 +269,7 @@
       "properties": {
         "id": 12,
         "z": "1",
-        "offset": "1",
+        "offsetY": "1",
         "forestTypes": "20",
         "otherForestTypes": "20Fe,20G"
       },

diff --git a/lib/data/nais/ecogram/12.geojson b/lib/data/nais/ecogram/12.geojson
@@ -223,7 +223,7 @@
       "properties": {
         "id": 10,
         "z": "1",
-        "offset": "1",
+        "offsetY": "1",
         "forestTypes": "20",
         "otherForestTypes": "20Fe,20G"
       },

diff --git a/lib/data/nais/ecogram/13.geojson b/lib/data/nais/ecogram/13.geojson
@@ -109,7 +109,7 @@
         "id": 5,
         "z": "1",
         "rows": "2",
-        "offset": "-1",
+        "offsetY": "-1",
         "forestTypes": "4",
         "otherForestTypes": "4G"
       },
@@ -157,7 +157,8 @@
         "id": 7,
         "z": "1",
         "rows": "2",
-        "offset": "1",
+        "offsetX": "1",
+        "offsetY": "1",
         "forestTypes": "3",
         "otherForestTypes": "3G"
       },

diff --git a/lib/data/nais/ecogram/15.geojson b/lib/data/nais/ecogram/15.geojson
@@ -153,7 +153,7 @@
       "properties": {
         "id": 7,
         "z": "2",
-        "offset": "-0.1",
+        "offsetY": "-0.1",
         "forestTypes": "47",
         "otherForestTypes": null
       },

diff --git a/lib/data/nais/ecogram/16.geojson b/lib/data/nais/ecogram/16.geojson
@@ -296,7 +296,7 @@
       "properties": {
         "id": 13,
         "z": "3",
-        "offset": "-0.1",
+        "offsetY": "-0.1",
         "forestTypes": "47",
         "otherForestTypes": null
       },
@@ -413,7 +413,7 @@
       "properties": {
         "id": 18,
         "z": "1",
-        "offset": "1",
+        "offsetY": "1.3",
         "forestTypes": "68",
         "otherForestTypes": null
       },
@@ -508,7 +508,7 @@
       "properties": {
         "id": 22,
         "z": "1",
-        "offset": "1",
+        "offsetY": "1",
         "forestTypes": "65*",
         "otherForestTypes": null
       },

diff --git a/lib/data/nais/ecogram/17.geojson b/lib/data/nais/ecogram/17.geojson
@@ -387,7 +387,7 @@
       "properties": {
         "id": 17,
         "z": "1",
-        "offset": "1",
+        "offsetY": "1",
         "forestTypes": "65*",
         "otherForestTypes": null
       },
@@ -550,7 +550,7 @@
       "properties": {
         "id": 24,
         "z": "1",
-        "offset": "1",
+        "offsetY": "1.3",
         "forestTypes": "68",
         "otherForestTypes": null
       },

diff --git a/lib/data/nais/ecogram/18.geojson b/lib/data/nais/ecogram/18.geojson
@@ -225,7 +225,7 @@
       "properties": {
         "id": 10,
         "z": "1",
-        "offset": "1",
+        "offsetY": "1",
         "forestTypes": "46MRe",
         "otherForestTypes": null
       },

diff --git a/lib/data/nais/ecogram/21.geojson b/lib/data/nais/ecogram/21.geojson
@@ -344,7 +344,7 @@
       "properties": {
         "id": 15,
         "z": "1",
-        "offset": "1",
+        "offsetY": "1",
         "forestTypes": "68",
         "otherForestTypes": null
       },

diff --git a/lib/data/nais/ecogram/23.geojson b/lib/data/nais/ecogram/23.geojson
@@ -227,7 +227,7 @@
         "id": 10,
         "z": "1",
         "rows": "3",
-        "offset": "0.2",
+        "offsetY": "0.2",
         "forestTypes": "60A",
         "otherForestTypes": "60ALä,60AG"
       },

diff --git a/lib/data/nais/ecogram/6.geojson b/lib/data/nais/ecogram/6.geojson
@@ -222,6 +222,7 @@
       "properties": {
         "id": 10,
         "z": "1",
+        "rows": "2",
         "forestTypes": "93",
         "otherForestTypes": null
       },

diff --git a/lib/data/sql/V3__create_types.sql b/lib/data/sql/V3__create_types.sql
@@ -223,7 +223,7 @@ VALUES ('obermontan',
 
 
 INSERT INTO altitudinal_zone_meta (projection, nais, code)
-VALUES ('ober- und untermontan',
+VALUES ('ober- & untermontan',
         'UMOM',
         '70');
 

diff --git a/lib/data/types.json b/lib/data/types.json
@@ -39637,7 +39637,7 @@
     { "de": "submontan", "id": 5, "code": "40" },
     { "de": "untermontan", "id": 6, "code": "50" },
     { "de": "obermontan", "id": 7, "code": "60" },
-    { "de": "ober- und untermontan", "id": 8, "code": "70" },
+    { "de": "ober- & untermontan", "id": 8, "code": "70" },
     { "de": "hochmontan", "id": 9, "code": "80" },
     { "de": "subalpin", "id": 10, "code": "90" },
     { "de": "obersubalpin", "id": 11, "code": "100" }

diff --git a/src/components/Ecogram.js b/src/components/Ecogram.js
@@ -22,11 +22,11 @@ function Ecogram({ data, selectForestType }) {
         <line x1="500" y1="0" x2="500" y2="1000" className={styles.grid} />
         <line x1="800" y1="0" x2="800" y2="1000" className={styles.grid} />
         <line x1="0" y1="200" x2="1000" y2="200" className={styles.grid} />
-        <line x1="0" y1="500" x2="1000" y2="500" className={styles.grid} />
+        <line x1="0" y1="492" x2="1000" y2="492" className={styles.grid} />
         <line x1="0" y1="800" x2="1000" y2="800" className={styles.grid} />
         {data
           .sort((a, b) => a.z - b.z)
-          .map(({ a, x, y, w, h, f, r, o }) => (
+          .map(({ a, x, y, w, h, f, r, ox, oy }) => (
             <>
               <rect
                 x={x}
@@ -38,11 +38,11 @@ function Ecogram({ data, selectForestType }) {
                 className={`${styles.box} ${a && styles.active}`}
                 onClick={({ target }) => setPopup({ target, forestTypes: f })}
               />
-              {r || o ? (
+              {r || ox || oy ? (
                 [...new Array(r)].map((_, i) => (
                   <text
-                    x={x + w / 2}
-                    y={y + h / 2 - (20 * r || 0) + 35 * (i + 1) - 35 * o}
+                    x={x + w / 2 + ox * 10}
+                    y={y + h / 2 - (20 * r || 0) + 35 * (i + 1) - 35 * oy}
                     className={styles.boxText}
                   >
                     {f