♻️ Rename map attributes to territory-location and region-location

Why: - Removes the ambiguity of using "location" for both of them, as in the SPA version. - Enables adding territory-number and potentially other attributes, as will be needed for the neighborhood map.
luontola · Jul 11, 2024 · ebeee7c · ebeee7c
1 parent a18f130
commit ebeee7c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/src/territory_bro/ui/printout_templates.clj b/src/territory_bro/ui/printout_templates.clj
@@ -43,7 +43,7 @@
       [:div {:class (:root styles)}
 
        [:div {:class (:minimap styles)}
-        [:territory-mini-map {:territory (:location territory)
+        [:territory-mini-map {:territory-location (:location territory)
                               :congregation-boundary congregation-boundary
                               :enclosing-region enclosing-region
                               :enclosing-minimap-viewport enclosing-minimap-viewport}]]
@@ -57,7 +57,7 @@
        [:div {:class (:map styles)}
         (print-date-notice
          print-date
-         [:territory-map {:location (:location territory)
+         [:territory-map {:territory-location (:location territory)
                           :map-raster map-raster
                           :printout true}])]
 
@@ -79,7 +79,7 @@
       [:div {:class (:root styles)}
 
        [:div {:class (:minimap styles)}
-        [:territory-mini-map {:territory (:location territory)
+        [:territory-mini-map {:territory-location (:location territory)
                               :congregation-boundary congregation-boundary
                               :enclosing-region enclosing-region
                               :enclosing-minimap-viewport enclosing-minimap-viewport}]]
@@ -93,7 +93,7 @@
        [:div {:class (:map styles)}
         (print-date-notice
          print-date
-         [:territory-map {:territory (:location territory)
+         [:territory-map {:territory-location (:location territory)
                           :map-raster map-raster
                           :printout true}])]
 
@@ -114,7 +114,7 @@
        [:div {:class (:map styles)}
         (print-date-notice
          print-date
-         [:region-map {:region (:location region)
+         [:region-map {:region-location (:location region)
                        :territories territories
                        :map-raster map-raster
                        :printout true}])]]))))
diff --git a/src/territory_bro/ui/territory_page.clj b/src/territory_bro/ui/territory_page.clj
@@ -138,7 +138,7 @@
 
       [:div.pure-u-1.pure-u-lg-2-3.pure-u-xl-3-4
        [:div {:class (:map styles)}
-        [:territory-map {:location (:location territory)
+        [:territory-map {:territory-location (:location territory)
                          :map-raster "osmhd"
                          :printout false}]]
        [:div.no-print

diff --git a/test/territory_bro/ui/printout_templates_test.clj b/test/territory_bro/ui/printout_templates_test.clj
@@ -59,7 +59,7 @@
                Please keep this card in the envelope. Do not soil, mark or bend it.
                Each time the territory is covered, please inform the brother who cares for the territory files.")
              (html/visible-text html)))
-      (is (str/includes? html "territory=\"MULTIPOLYGON(territory)\""))
+      (is (str/includes? html "territory-location=\"MULTIPOLYGON(territory)\""))
       (is (str/includes? html "congregation-boundary=\"MULTIPOLYGON(congregation boundary)\""))
       (is (str/includes? html "enclosing-region=\"MULTIPOLYGON(region)\""))
       (is (str/includes? html "enclosing-minimap-viewport=\"POLYGON(minimap viewport)\""))
@@ -86,7 +86,7 @@
                Please keep this card in the envelope. Do not soil, mark or bend it.
                Each time the territory is covered, please inform the brother who cares for the territory files.")
              (html/visible-text html)))
-      (is (str/includes? html "territory=\"MULTIPOLYGON(territory)\""))
+      (is (str/includes? html "territory-location=\"MULTIPOLYGON(territory)\""))
       (is (str/includes? html "congregation-boundary=\"MULTIPOLYGON(congregation boundary)\""))
       (is (str/includes? html "enclosing-region=\"MULTIPOLYGON(region)\""))
       (is (str/includes? html "enclosing-minimap-viewport=\"POLYGON(minimap viewport)\""))
@@ -105,6 +105,6 @@
               "The Region
                Printed 2024-07-10 with TerritoryBro.com")
              (html/visible-text html)))
-      (is (str/includes? html "region=\"MULTIPOLYGON(region)\""))
+      (is (str/includes? html "region-location=\"MULTIPOLYGON(region)\""))
       (is (str/includes? html "territories=\"[{&quot;number&quot;:&quot;123&quot;,&quot;location&quot;:&quot;MULTIPOLYGON(territory)&quot;}]\""))
       (is (str/includes? html "map-raster=\"osmhd\"")))))
diff --git a/web/src/maps/RegionMap.ts b/web/src/maps/RegionMap.ts
@@ -61,7 +61,9 @@ export default class RegionMap extends OpenLayersMap<Props> {
 
 export class RegionMapElement extends OpenLayersMapElement {
   createMap({root, mapRaster}) {
-    const region = {location: this.getAttribute("region")};
+    const region = {
+      location: this.getAttribute("region-location")
+    };
     const territories = JSON.parse(this.getAttribute("territories") ?? "[]");
     const map = initRegionMap(root, region as Region, territories);
     map.setStreetsLayerRaster(mapRaster);

diff --git a/web/src/maps/TerritoryMap.ts b/web/src/maps/TerritoryMap.ts
@@ -62,9 +62,11 @@ export default class TerritoryMap extends OpenLayersMap<Props> {
 }
 
 export class TerritoryMapElement extends OpenLayersMapElement {
-  createMap({root, printout, mapRaster}) {
-    const location = this.getAttribute("location");
-    const map = initTerritoryMap(root, {location} as Territory, printout)
+  createMap({root, mapRaster, printout}) {
+    const territory = {
+      location: this.getAttribute("territory-location")
+    };
+    const map = initTerritoryMap(root, territory as Territory, printout)
     map.setStreetsLayerRaster(mapRaster);
     return map
   }

diff --git a/web/src/maps/TerritoryMiniMap.ts b/web/src/maps/TerritoryMiniMap.ts
@@ -46,7 +46,7 @@ export default class TerritoryMiniMap extends OpenLayersMap<Props> {
 export class TerritoryMiniMapElement extends OpenLayersMapElement {
   createMap({root}) {
     const territory = {
-      location: this.getAttribute("territory"),
+      location: this.getAttribute("territory-location"),
       enclosingMinimapViewport: this.getAttribute("enclosing-minimap-viewport"),
       enclosingRegion: this.getAttribute("enclosing-region"),
     };