add movelayer

BetaNYC · Dec 12, 2023 · 2485d3a · 2485d3a
1 parent 16268d5
commit 2485d3a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/components/Geopanel/Geopanel.tsx b/components/Geopanel/Geopanel.tsx
@@ -34,6 +34,12 @@ const Geopanel = () => {
         setDistricts(district)
         setSelectedDistrictFeatures(clickedDistrictData.features[0])
         setSelectedDistrictOverlappedData((district === "senate" ? senateOverlapped : assemblyOverlapped).filter(d => d.district === clickedDistrictData.features[0]?.properties.District)[0])
+
+
+        // map?.moveLayer("background", "districts")
+        // map?.moveLayer("background", "pattern")
+        // map?.moveLayer("pattern", 'districts_outline')
+        // map?.moveLayer("districts", 'districts_outline')
     }
 
     const districtMouseEnverHandler = (e: MouseEvent<HTMLElement>, district: Districts) => {
@@ -48,6 +54,7 @@ const Geopanel = () => {
             type: "FeatureCollection",
             features: hoveredDistrctData.features
         })
+
     }
 
     const zipcodeMouseEnterHandler = (e: MouseEvent<HTMLElement>) => {

diff --git a/components/Map/Map.tsx b/components/Map/Map.tsx
@@ -212,6 +212,12 @@ const Map = () => {
             });
 
 
+
+
+
+
+
+
             m.addLayer({
                 'id': 'members',
                 'type': 'circle',
@@ -317,9 +323,11 @@ const Map = () => {
             m.moveLayer("districts", "counties_borders")
             m.moveLayer('pattern', "counties_borders")
             m.moveLayer("districts", "zipcodes")
+            m.moveLayer("pattern", 'districts_outline')
             m.moveLayer("pattern", "zipcodes")
 
 
+
             m.on("click", "districts", (e: MapMouseEvent & EventData) => {
 
                 mapClickHandler(m, e, legislations)

diff --git a/context/MapContext.tsx b/context/MapContext.tsx
@@ -75,7 +75,6 @@ const MapProvider = ({ children }: Props) => {
         const targetPolygon = turf.polygon([coordinatesArray])
         /* @ts-ignore */
         let targetCentroid = turf.center(targetPolygon).geometry.coordinates
-        console.log(targetCentroid)
         if(district === 48) targetCentroid[1] = targetCentroid[1] - 0.25
         if(district === 49) {
             targetCentroid[0] = targetCentroid[0] - 0.275
@@ -112,18 +111,21 @@ const MapProvider = ({ children }: Props) => {
         })
 
         m.moveLayer("districts", "districts_clicked_outline")
+        m.moveLayer("districts", "districts_outline")
         m.moveLayer("districts", "members")
         m.moveLayer('districts', "counties_borders")
         m.moveLayer('pattern', "counties_borders")
+        m.moveLayer("pattern", "district_label")
+        m.moveLayer('pattern', 'districts_outline')
+        m.moveLayer('pattern', 'districts_clicked_outline')
+        m.moveLayer('pattern', 'members')
         m.moveLayer("background", "zipcodes")
         m.moveLayer("districts", "zipcodes")
         m.moveLayer("districts_outline", "members")
         m.moveLayer('districts_outline', 'districts_clicked_outline')
         m.moveLayer("districts_clicked_outline", "members")
         m.moveLayer("districts_clicked_outline", "district_label")
-        m.moveLayer("pattern", "district_label")
-        m.moveLayer('pattern', 'districts_clicked_outline')
-        m.moveLayer('pattern', 'members')
+
 
         setPanelShown({ geopanelShown: true, memberpanelShown: false })
         setSelectedDistrictFeatures(e.features[0])