Merge pull request #6 from geovisto/bp-new-pages

Fixes - Bp new pages

src/components/bootstrap/layers/layers.css

@@ -59,13 +59,11 @@
 }
 
 .tabs__nav a:hover{
-    font-size: 25px;
-    color: var(--text-color-hover);
+    color: var(--text-color-hover-layers);
 }
 
 .tabs__nav li:has(a:hover) {
-    font-size: 25px;
-    color: var(--text-color-hover);
+    color: var(--text-color-hover-layers);
 }
 
 .tabs__nav li:has(a.tab__active) {

src/css/custom.css

@@ -74,6 +74,8 @@
 
     --text-color: #ffffff;
     --text-color-hover: #eaeaea;
+    --text-color-hover-layers: #8b8b8b;
+
 
 
     --ifm-background-color:#1b1b1d;
@@ -114,6 +116,8 @@ html[data-theme='dark'] {
 
     --text-color: black;
     --text-color-hover: #d8d8d8;
+    --text-color-hover-layers: #636363;
+
 
 
     --ifm-background-color:#f8f8f8;

src/geovisto_demos/components/PlaygroundBarGeojson.tsx → src/geovisto_demos/components/PlaygroundBarGeo.tsx

@@ -8,7 +8,7 @@ const C_ID_select_geojson = "leaflet-combined-map-select-geojson";
 const C_ID_input_geojson = "leaflet-combined-map-input-geojson";
 const C_ID_input_geojson_export = "leaflet-combined-map-input-export-geojson";
 
-const PlaygroundBarGeojson = (props) => {
+const PlaygroundBarGeo = (props) => {
     const [isLoading, setIsLoading] = useState(false);
 
     const [state, setState] = useState({
@@ -63,7 +63,7 @@ const PlaygroundBarGeojson = (props) => {
     const handleChange = async (e) => {
         setIsLoading(true);
         state.value = e;
-        const geojson = (await file('resources/geojson/' + e.value)).data
+        const geojson = (await file('resources/geo/' + e.value)).data
         props.callback(e.value, geojson);
         setIsLoading(false);
     }
@@ -100,4 +100,4 @@ const PlaygroundBarGeojson = (props) => {
     );
 };
 
-export default PlaygroundBarGeojson;
+export default PlaygroundBarGeo;

src/geovisto_demos/components/index.ts

@@ -1,7 +1,7 @@
 import PlaygroundBarData from "./PlaygroundBarData";
 import PlaygroundBarConfig from "./PlaygroundBarConfig";
-import PlaygroundBarGeojson from "./PlaygroundBarGeojson";
+import PlaygroundBarGeo from "./PlaygroundBarGeo";
 import PlaygroundBarSearchDatasets from "./PlaygroundBarSearchDatasets";
 
 
-export { PlaygroundBarData, PlaygroundBarGeojson,  PlaygroundBarConfig, PlaygroundBarSearchDatasets};
+export { PlaygroundBarData, PlaygroundBarGeo,  PlaygroundBarConfig, PlaygroundBarSearchDatasets};

src/geovisto_demos/modules/layers/bubble/Bubble.tsx

@@ -8,8 +8,8 @@ import "geovisto-layer-bubble/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-bubbleLayer.json";
-import data from "../../../../../static/data/covidCases.json";
+import config from "../../../../../static/config/config-layer-bubble.json";
+import data from "../../../../../static/data/data-covidCases.json";
 
 // Base core of Geovisto
 import Base from "../../../GeovistoBase";

src/geovisto_demos/modules/layers/choropleth/Choropleth.tsx

@@ -11,8 +11,8 @@ import "./Choropleth.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/gdp_config.json";
-import data from "../../../../../static/data/gdp_oecd.json";
+import config from "../../../../../static/config/config-layer-choro.json";
+import data from "../../../../../static/data/data-choro.json";
 import polygons from "../../../../../static/geo/country_polygons.json";
 
 // Base core of Geovisto

src/geovisto_demos/modules/layers/connection/Connection.tsx

@@ -11,7 +11,7 @@ import "./Connection.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/trade_config.json";
+import config from "../../../../../static/config/config-layer-connection.json";
 import data from "../../../../../static/data/trade_oecd.json";
 import polygons from "../../../../../static/geo/country_polygons.json";
 import centroids from "../../../../../static/geo/country_centroids.json";

src/geovisto_demos/modules/layers/dot/Dot.tsx

@@ -8,8 +8,8 @@ import "geovisto-layer-dot/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-dotLayer.json";
-import data from "../../../../../static/data/czechCities.json";
+import config from "../../../../../static/config/config-layer-dot.json";
+import data from "../../../../../static/data/data-czechCities.json";
 
 // Base core of Geovisto
 import Base from "../../../GeovistoBase";

src/geovisto_demos/modules/layers/heat/Heat.tsx

@@ -8,8 +8,8 @@ import "geovisto-layer-heat/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-australiaMaxTemperature.json";
-import data from "../../../../../static/data/australiaMaxTemperature.json";
+import config from "../../../../../static/config/config-layer-heat.json";
+import data from "../../../../../static/data/data-heat.json";
 
 // Base core of Geovisto
 import Base from "../../../GeovistoBase";

src/geovisto_demos/modules/layers/map/Map.tsx

@@ -8,8 +8,7 @@ import "geovisto-layer-heat/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-map.json";
-import data from "../../../../../static/data/australiaMaxTemperature.json";
+import config from "../../../../../static/config/config-layer-tiles.json";
 
 // Base core of Geovisto
 import Base from "../../../GeovistoBase";
@@ -23,7 +22,7 @@ const Map = () => {
         <Base
             {...{
                 config,
-                data,
+                //data,
                 moduleToDisplay,
             }}
         />

src/geovisto_demos/modules/layers/marker/Marker.tsx

@@ -11,8 +11,8 @@ import "./Marker.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/energy_config.json";
-import data from "../../../../../static/data/energy_un.json";
+import config from "../../../../../static/config/config-layer-marker.json";
+import data from "../../../../../static/data/data-marker.json";
 import centroids from "../../../../../static/geo/country_centroids.json";
 
 // Base core of Geovisto

src/geovisto_demos/modules/layers/spike/Spike.tsx

@@ -5,8 +5,8 @@ import { GeovistoSpikeLayerTool } from "geovisto-layer-spike";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-spikeLayer.json";
-import data from "../../../../../static/data/covidCases.json";
+import config from "../../../../../static/config/config-layer-spike.json";
+import data from "../../../../../static/data/data-covidCases.json";
 
 // Base core of Geovisto
 import Base from "../../../GeovistoBase";

src/geovisto_demos/modules/tools/filters/Filters.tsx

@@ -10,8 +10,8 @@ import "geovisto-layer-choropleth/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-filter.json";
-import data from "../../../../../static/data/gdp_oecd.json";
+import config from "../../../../../static/config/config-tool-filter.json";
+import data from "../../../../../static/data/data-choro.json";
 import polygons from "../../../../../static/geo/country_polygons.json";
 
 // Base core of Geovisto

src/geovisto_demos/modules/tools/geo-downloader/Geo-Downloader.tsx

@@ -10,9 +10,7 @@ import "geovisto-layer-choropleth/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-geo-downloader.json";
-import data from "../../../../../static/data/demo1.json";
-import polygons from "../../../../../static/geo/country_polygons.json";
+import config from "../../../../../static/config/config-tool-geo-downloader.json";
 
 // Base core of Geovisto
 import Base from "../../../GeovistoBase";
@@ -23,17 +21,11 @@ const Geo_Downloader = () => {
         id: "geovisto-tool-geo-downloader",
     });
 
-    const geoData = Geovisto.getGeoDataManager([
-        Geovisto.getGeoDataFactory().geojson("world polygons", polygons),
-    ]);
-
     return (
         <Base
             {...{
                 config,
-                data,
                 moduleToDisplay,
-                geoData,
             }}
         />
     );

src/geovisto_demos/modules/tools/hierarchy/Hierarchy.tsx

@@ -10,9 +10,9 @@ import "geovisto-layer-choropleth/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-hierarchy.json";
-import data from "../../../../../static/data/hierarchy_data.json";
-import polygons from "../../../../../static/geo/hierarchy_geo.json";
+import config from "../../../../../static/config/config-tool-hierarchy.json";
+import data from "../../../../../static/data/data-hierarchy.json";
+import polygons from "../../../../../static/geo/geo-hierarchy.json";
 
 // Base core of Geovisto
 import Base from "../../../GeovistoBase";

src/geovisto_demos/modules/tools/info/Info.tsx

@@ -10,9 +10,7 @@ import "geovisto-layer-choropleth/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-info.json";
-import data from "../../../../../static/data/gdp_oecd.json";
-import polygons from "../../../../../static/geo/country_polygons.json";
+import config from "../../../../../static/config/config-tool-info.json";
 
 // Base core of Geovisto
 import Base from "../../../GeovistoBase";
@@ -23,17 +21,11 @@ const Info = () => {
         id: "geovisto-tool-layer-choropleth",
     });
 
-    const geoData = Geovisto.getGeoDataManager([
-        Geovisto.getGeoDataFactory().geojson("world polygons", polygons),
-    ]);
-
     return (
         <Base
             {...{
                 config,
-                data,
                 moduleToDisplay,
-                geoData,
             }}
         />
     );

src/geovisto_demos/modules/tools/legend/Legend.tsx

@@ -10,8 +10,8 @@ import "geovisto-layer-choropleth/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-legend.json";
-import data from "../../../../../static/data/gdp_oecd.json";
+import config from "../../../../../static/config/config-tool-legend.json";
+import data from "../../../../../static/data/data-choro.json";
 import polygons from "../../../../../static/geo/country_polygons.json";
 
 // Base core of Geovisto

src/geovisto_demos/modules/tools/selection/Selection.tsx

@@ -10,8 +10,8 @@ import "geovisto-layer-choropleth/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-selection.json";
-import data from "../../../../../static/data/gdp_oecd.json";
+import config from "../../../../../static/config/config-tool-selection.json";
+import data from "../../../../../static/data/data-choro.json";
 import polygons from "../../../../../static/geo/country_polygons.json";
 
 // Base core of Geovisto

src/geovisto_demos/modules/tools/sidebar/Sidebar.tsx

@@ -10,9 +10,7 @@ import "geovisto-layer-choropleth/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-sidebar.json";
-import data from "../../../../../static/data/gdp_oecd.json";
-import polygons from "../../../../../static/geo/country_polygons.json";
+import config from "../../../../../static/config/config-tool-sidebar.json";
 
 // Base core of Geovisto
 import Base from "../../../GeovistoBase";
@@ -23,17 +21,11 @@ const Tools = () => {
         id: "geovisto-tool-layer-choropleth",
     });
 
-    const geoData = Geovisto.getGeoDataManager([
-        Geovisto.getGeoDataFactory().geojson("world polygons", polygons),
-    ]);
-
     return (
         <Base
             {...{
                 config,
-                data,
                 moduleToDisplay,
-                geoData,
             }}
         />
     );

src/geovisto_demos/modules/tools/themes/Themes.tsx

@@ -10,9 +10,7 @@ import "geovisto-layer-choropleth/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-themes.json";
-import data from "../../../../../static/data/gdp_oecd.json";
-import polygons from "../../../../../static/geo/country_polygons.json";
+import config from "../../../../../static/config/config-tool-themes.json";
 
 // Base core of Geovisto
 import Base from "../../../GeovistoBase";
@@ -23,17 +21,11 @@ const Tools = () => {
         id: "geovisto-tool-layer-choropleth",
     });
 
-    const geoData = Geovisto.getGeoDataManager([
-        Geovisto.getGeoDataFactory().geojson("world polygons", polygons),
-    ]);
-
     return (
         <Base
             {...{
                 config,
-                data,
                 moduleToDisplay,
-                geoData,
             }}
         />
     );

src/geovisto_demos/modules/tools/timeline/Timeline.tsx

@@ -10,8 +10,8 @@ import "geovisto-layer-choropleth/dist/index.css";
 import React from "react";
 
 // Static
-import config from "../../../../../static/config/config-timeline.json";
-import data from "../../../../../static/data/gdp_oecd.json";
+import config from "../../../../../static/config/config-tool-timeline.json";
+import data from "../../../../../static/data/data-choro.json";
 import polygons from "../../../../../static/geo/country_polygons.json";
 
 // Base core of Geovisto