From 281720d10bad9a2526b56b9a869da833bd862930 Mon Sep 17 00:00:00 2001 From: louai98 Date: Mon, 3 Jun 2024 15:56:29 +0200 Subject: [PATCH] add info box --- .../ControlInAfrica/ControlInAfricaMap.js | 980 ++++++++++-------- .../Layout/ControlInAfrica/DetailsSection.jsx | 169 ++- .../Layout/ControlInAfrica/MapInfoBox.jsx | 179 ++++ src/Data/ControlinAfrica.geojson | 629 +++++++---- src/Styles/Layout/_filters.scss | 1 + src/Styles/Layout/_info_section.scss | 4 + src/Styles/Layout/_map.scss | 4 +- src/Styles/Layout/_map_info_box.scss | 12 + src/Styles/main.scss | 2 + src/tmp/code.txt | 82 ++ 10 files changed, 1418 insertions(+), 644 deletions(-) create mode 100644 src/Components/Layout/ControlInAfrica/MapInfoBox.jsx create mode 100644 src/Styles/Layout/_info_section.scss create mode 100644 src/Styles/Layout/_map_info_box.scss create mode 100644 src/tmp/code.txt diff --git a/src/Components/Layout/ControlInAfrica/ControlInAfricaMap.js b/src/Components/Layout/ControlInAfrica/ControlInAfricaMap.js index 3226d28..a10242f 100644 --- a/src/Components/Layout/ControlInAfrica/ControlInAfricaMap.js +++ b/src/Components/Layout/ControlInAfrica/ControlInAfricaMap.js @@ -5,6 +5,11 @@ import L, { control } from "leaflet"; import Africa from "../../../Data/ControlinAfrica.geojson"; import "../../../Styles/main.scss"; import { CountryStyle, CountrySelectedStyle } from "./countryStyles"; +import MapInfoBox from "./MapInfoBox"; // Import the InfoBox component + +import Container from "react-bootstrap/Container"; +import Row from "react-bootstrap/Row"; +import Col from "react-bootstrap/Col"; import Icon1 from "../../../Icons/icon1.svg"; import Icon2 from "../../../Icons/icon2.svg"; @@ -51,12 +56,112 @@ class ControlInAfricaMap extends React.Component { selectedCountry: "", openedTooltipLayer: null, - selectedCountriesFilter: [], + selectedCountriesNames: [], + selectedCountriesFeatures: [], selectedCountryColor: "yellow", selectedRegion: "", + prevStatues: "", + + infoBox: [], + showInfoBox: false, }; } + regional_organisations = [ + { name: "AU", color: "#b2df8a" }, + { name: "EAC", color: "#33a02c" }, + { name: "IGAD", color: "#fb9a99" }, + { name: "UMA", color: "#e31a1c" }, + { name: "COMESA", color: "#fdbf6f" }, + { name: "ECOWAS", color: "#ff7f00" }, + { name: "CEN-SAD", color: "#cab2d6" }, + { name: "SADC", color: "#6a3d9a" }, + { name: "ECCAS", color: "#ffff99" }, + { name: "ICGLR", color: "#b15928" }, + { name: "RECSA", color: "#a6cee3" }, + { name: "SARCOM", color: "#1f78b4" }, + ]; + + regional_treaties = [ + { + name: "Bamako Declaration", + name2: "BamakoDeclaration", + icon_eligible: Icon26, + icon_signed: Icon24, + icon_ratified: null, + }, + { + name: "Kinshasa Convention", + name2: "KinshasaConvention", + icon_eligible: Icon4, + icon_signed: Icon6, + icon_ratified: Icon5, + }, + { + name: "ECOWAS Convention", + name2: "ECOWASConvention", + icon_eligible: Icon2, + icon_signed: Icon3, + icon_ratified: null, + }, + { + name: "Khartoum Declaration", + name2: "KhartoumDeclaration", + icon_eligible: Icon21, + icon_signed: Icon23, + icon_ratified: null, + }, + { + name: "Nairobi Protocol", + name2: "NairobiProtocol", + icon_eligible: Icon22, + icon_signed: Icon25, + icon_ratified: null, + }, + { + name: "SADC Firearms Protocol", + name2: "SADCFirearmsProtocol", + icon_eligible: Icon8, + icon_signed: Icon7, + icon_ratified: Icon9, + }, + ]; + + international_treaties = [ + { + name: "Arms Trade Treaty", + name2: "ArmsTradeTreaty", + icon_eligible: Icon19, + icon_signed: Icon17, + icon_ratified: Icon18, + }, + { + name: "Firearms Protocol", + name2: "FirearmsProtocol", + icon_eligible: Icon12, + icon_signed: Icon10, + icon_ratified: Icon11, + }, + { + name: "Wassenaar Agreement", + name2: "WassenaarAgreement", + icon_eligible: Icon15, + icon_signed: Icon13, + icon_ratified: Icon14, + }, + ]; + intsruments = [ + { name2: "UNProgrammeofAction", name: "UN Programme of Action" }, + { + name2: "InternationalTracingInstrument", + name: "International Tracing Instrument", + }, + { + name2: "StG-PoA", + name: "Silencing the Guns in Africa Programme of Action", + }, + ]; + componentDidMount() { this.fetchAfricaCountries(); this.calculateZoomLevel(); @@ -159,7 +264,7 @@ class ControlInAfricaMap extends React.Component { onMouseClick = (e) => { this.setState({ - selectedCountriesFilter: [], + selectedCountriesNames: [], selectedCountryColor: "yellow", }); const countryName = e.target.feature.properties.name; @@ -173,134 +278,118 @@ class ControlInAfricaMap extends React.Component { }; handleOrganizationClick = (name, status, color) => { - if (this.state.selectedRegion === name) { + const { selectedRegion, prevStatues, africaCountries } = this.state; + + if (selectedRegion === name && prevStatues === status) { this.setState({ - selectedCountriesFilter: [], + selectedCountriesNames: [], selectedCountryColor: "yellow", selectedCountry: "", selectedRegion: "", + prevStatues: "", + showInfoBox: false, }); return; } - this.setState({ - selectedCountriesFilter: [], - selectedCountryColor: color, - selectedCountry: "", - selectedRegion: name, + + let selectedCountriesNames = []; + let selectedCountriesFeatures = []; + + africaCountries.forEach((feature) => { + if ( + feature.properties[name] === 1 || + feature.properties[name] === status + ) { + selectedCountriesNames.push(feature.properties.name); + selectedCountriesFeatures.push(feature); + } }); - // Regional Organisation + International Guidelines & Instruments + African Guidelines & Instrumentss - this.state.africaCountries.map((feature) => { - if (feature.properties[name] === 1) { - this.setState((prevState) => ({ - selectedCountriesFilter: [ - ...prevState.selectedCountriesFilter, - feature.properties.name, - ], - })); - } - }); - // Regional Treaties + International Treaties - this.state.africaCountries.map((feature) => { - if (feature.properties[name] === status) { - this.setState((prevState) => ({ - selectedCountriesFilter: [ - ...prevState.selectedCountriesFilter, - feature.properties.name, - ], - })); - } + this.setState( + { + selectedCountriesNames, + selectedCountryColor: color, + selectedCountry: "", + selectedRegion: name, + prevStatues: status, + selectedCountriesFeatures, + }, + + ); + + if (this.regional_organisations.some(org => org.name === name)) { + this.setState({ + showInfoBox: true, + }, + this.regionalOrganisationStatistics + ) + } + else{ + this.setState({ + showInfoBox: false, + }) + } + }; + + regionalOrganisationStatistics = () => { + const { selectedCountriesFeatures } = this.state; + + // Helper function to process treaties + const processTreaties = (treaties) => { + return treaties.map((org) => { + let countriesSigned = 0; + let countriesEligible = 0; + let countriesRatified = 0; + + selectedCountriesFeatures.forEach((feature) => { + const status = feature.properties[org.name2]; + if (status === "Signed") { + countriesSigned++; + } else if (status === "Eligible") { + countriesEligible++; + } else if (status === "Ratified") { + countriesRatified++; + } + }); + + return { + name: org.name, + signed: countriesSigned, + eligible: countriesEligible, + ratified: countriesRatified, + }; + }); + }; + + const organisationsRegionalTreaties = processTreaties( + this.regional_treaties + ); + const organisationsInternationalTreaties = processTreaties( + this.international_treaties + ); + + const organisationsInstruments = this.intsruments.map((instrument) => { + const countris = selectedCountriesFeatures.filter( + (feature) => feature.properties[instrument.name2] === 1 + ); + return { + name: instrument.name, + countries: countris.length, + }; }); + + return { + organisationsRegionalTreaties, + organisationsInternationalTreaties, + organisationsInstruments, + }; }; render() { const findColorByName = (name) => { - const org = regional_organisations.find((org) => org.name === name); + const org = this.regional_organisations.find((org) => org.name === name); return org ? org.color : ""; // Return color value if found, otherwise return an empty string }; - const regional_organisations = [ - { name: "AU", color: "#b2df8a" }, - { name: "EAC", color: "#33a02c" }, - { name: "IGAD", color: "#fb9a99" }, - { name: "UMA", color: "#e31a1c" }, - { name: "COMESA", color: "#fdbf6f" }, - { name: "ECOWAS", color: "#ff7f00" }, - { name: "CEN-SAD", color: "#cab2d6" }, - { name: "SADC", color: "#6a3d9a" }, - { name: "ECCAS", color: "#ffff99" }, - { name: "ICGLR", color: "#b15928" }, - { name: "RECSA", color: "#a6cee3" }, - { name: "SARCOM", color: "#1f78b4" }, - ]; - - const regional_treaties = [ - { - name: "Bamako Declaration", - name2: "BamakoDeclaration", - icon_eligible: Icon26, - icon_signed: Icon24, - icon_ratified: null, - }, - { - name: "Kinshasa Convention", - name2: "KinshasaConvention", - icon_eligible: Icon4, - icon_signed: Icon6, - icon_ratified: Icon5, - }, - { - name: "ECOWAS Convention", - name2: "ECOWASConvention", - icon_eligible: Icon2, - icon_signed: Icon3, - icon_ratified: null, - }, - { - name: "Khartoum Declaration", - name2: "KhartoumDeclaration", - icon_eligible: Icon21, - icon_signed: Icon23, - icon_ratified: null, - }, - { - name: "Nairobi Protocol", - name2: "NairobiProtocol", - icon_eligible: Icon22, - icon_signed: Icon25, - icon_ratified: null, - }, - { - name: "SADC Firearms Protocol", - name2: "SADCFirearmsProtocol", - icon_eligible: Icon8, - icon_signed: Icon7, - icon_ratified: Icon9, - }, - ]; - - const international_treaties = [ - { - name: "Arms Trade Treaty", - name2: "ArmsTradeTreaty", - icon_eligible: Icon19, - icon_signed: Icon17, - icon_ratified: Icon18, - }, - { - name: "Firearms Protocol", - name2: "FirearmsProtocol", - icon_eligible: Icon12, - icon_signed: Icon10, - icon_ratified: Icon11, - }, - { - name: "Wassenaar Agreement", - name2: "WassenaarAgreement", - icon_eligible: Icon15, - icon_signed: Icon13, - icon_ratified: Icon14, - }, - ]; const { africaCountries, @@ -308,8 +397,9 @@ class ControlInAfricaMap extends React.Component { error, countriesNames, selectedCountry, - selectedCountriesFilter, + selectedCountriesNames, selectedCountryColor, + selectedRegion, } = this.state; if (loading) { @@ -319,341 +409,343 @@ class ControlInAfricaMap extends React.Component { return
Error: {error.message}
; } return ( - -
-
-
African Countries
+ + + +
+
+
African Countries
- -
-
-
-
Regional Organisations
-
- {regional_organisations.map((org, index) => ( -
- this.handleOrganizationClick(org.name, "", org.color) - } + +
- ))} -
-
-
-
- International Guidelines & Instruments
- - (countries with recent activities only, 2014 - 2019) - -
-
-
UN Programme of Action
- - this.handleOrganizationClick("UNProgrammeofAction") - } - /> -
-
-
- International Tracing Instrument -
- - this.handleOrganizationClick("InternationalTracingInstrument") - } - /> -
-
-
-
-
African Guidelines & Instrumentss
-
-
- Silencing the Guns in Africa Programme of Action -
- this.handleOrganizationClick("StG-PoA")} - /> -
-
-
- -
- - {africaCountries && ( - <> - - feature.properties.name === selectedCountry || - selectedCountriesFilter.find( - (item) => item === feature.properties.name - ) - ? CountrySelectedStyle(selectedCountryColor) - : CountryStyle() - } - key="africa-map" - data={africaCountries} - /> - - )} - {selectedCountry && - africaCountries.map((feature) => { - if (feature.properties.name === selectedCountry) { - return ( - +
Regional Organisations
+
+ {this.regional_organisations.map((org, index) => ( +
+ this.handleOrganizationClick(org.name, "", org.color) + } > - -
{feature.properties.name}
-
- {regional_organisations.map((org) => ( -
- ))} -
-
- {regional_treaties.map((org) => ( -
- {(feature.properties[org.name2] === - "Eligible" && ( - - )) || - (feature.properties[org.name2] === "Signed" && ( - - )) || - (feature.properties[org.name2] === - "Ratified" && ( - - ))} -
- ))} -
-
- {international_treaties.map((org) => ( -
- {(feature.properties[org.name2] === - "Eligible" && ( - - )) || - (feature.properties[org.name2] === "Signed" && ( - - )) || - (feature.properties[org.name2] === - "Ratified" && ( - - ))} -
- ))} -
-
-
- {feature.properties.UNProgrammeofAction === 1 && ( - - )} -
-
- {feature.properties - .InternationalTracingInstrument === 1 && ( - - )} -
-
- {feature.properties["StG-PoA"] === 1 && ( - - )} -
-
- - - ); - } - })} +
{org.name}
+
+ ))} +
-
- - - +
+
+
+
Regional Treaties
+
+ {this.regional_treaties.map((treaty) => ( +
+
{treaty.name}
+ + {treaty.icon_eligible && ( + {`${treaty.name}-Eligible`} + this.handleOrganizationClick( + treaty.name2, + "Eligible" + ) + } + /> + )} + {treaty.icon_signed && ( + {`${treaty.name}-Signed`} + this.handleOrganizationClick(treaty.name2, "Signed") + } + /> + )} + {treaty.icon_ratified && ( + {`${treaty.name}-Ratified`} + this.handleOrganizationClick( + treaty.name2, + "Ratified" + ) + } + /> + )} +
+ ))} +
+
+
+
+
International Treaties
+ {this.international_treaties.map((treaty) => ( +
+
{treaty.name}
+ + {treaty.icon_eligible && ( + {`${treaty.name}-Eligible`} + this.handleOrganizationClick(treaty.name2, "Eligible") + } + /> + )} + {treaty.icon_signed && ( + {`${treaty.name}-Signed`} + this.handleOrganizationClick(treaty.name2, "Signed") + } + /> + )} + {treaty.icon_ratified && ( + {`${treaty.name}-Ratified`} + this.handleOrganizationClick(treaty.name2, "Ratified") + } + /> + )} +
+ ))} +
+
+
+
+ International Guidelines & Instruments
+ + (countries with recent activities only, 2014 - 2019) + +
+
+
UN Programme of Action
+ + this.handleOrganizationClick("UNProgrammeofAction") + } + /> +
+
+
+ International Tracing Instrument +
+ + this.handleOrganizationClick( + "InternationalTracingInstrument" + ) + } + /> +
+
+
+
+
African Guidelines & Instrumentss
+
+
+ Silencing the Guns in Africa Programme of Action +
+ this.handleOrganizationClick("StG-PoA")} + /> +
+
- -
- + + +
+ + {africaCountries && ( + <> + + feature.properties.name === selectedCountry || + selectedCountriesNames.find( + (item) => item === feature.properties.name + ) + ? CountrySelectedStyle(selectedCountryColor) + : CountryStyle() + } + key="africa-map" + data={africaCountries} + /> + + )} + {selectedCountry && + africaCountries.map((feature) => { + if (feature.properties.name === selectedCountry) { + return ( + + +
{feature.properties.name}
+
+ {this.regional_organisations.map((org) => ( +
+ ))} +
+
+ {this.regional_treaties.map((org) => ( +
+ +
+ ))} +
+
+ {this.international_treaties.map((org) => ( +
+ +
+ ))} +
+
+
+ {feature.properties.UNProgrammeofAction === + 1 && } +
+
+ {feature.properties + .InternationalTracingInstrument === 1 && ( + + )} +
+
+ {feature.properties["StG-PoA"] === 1 && ( + + )} +
+
+ + + ); + } + })} + +
+ + + +
+ {this.state.showInfoBox && ( + + )} + +
+ + + ); } } diff --git a/src/Components/Layout/ControlInAfrica/DetailsSection.jsx b/src/Components/Layout/ControlInAfrica/DetailsSection.jsx index 9523372..4e04f6b 100644 --- a/src/Components/Layout/ControlInAfrica/DetailsSection.jsx +++ b/src/Components/Layout/ControlInAfrica/DetailsSection.jsx @@ -1,4 +1,5 @@ import React, { useState, useEffect } from "react"; +import Stack from "react-bootstrap/Stack"; import Card_ from "../../UI/Card_/Card_"; import { useAfricaData } from "../../../Context/DataContext"; @@ -117,12 +118,12 @@ const international_guidelines = [ { name: "UN Programme of Action", name2: "UNProgrammeofAction", - icon_eligible: Icon15, + icon_eligible: Icon20, }, { name: "International Tracing Instrument", name2: "InternationalTracingInstrument", - icon_eligible: Icon15, + icon_eligible: Icon16, }, ]; @@ -130,7 +131,7 @@ const african_guidelines = [ { name: "Silencing the Guns in Africa Programme of Action", name2: "StG-PoA", - icon_eligible: Icon15, + icon_eligible: Icon1, }, ]; @@ -151,7 +152,7 @@ const DetailesSection = (props) => { ); useEffect(() => { - if (data && countryID != null) { + if (data && countryID !== null) { const foundCountry = data.features.find( (item) => item.properties.id === countryID ); @@ -162,16 +163,42 @@ const DetailesSection = (props) => { ); setSelectedRegionalOrganisations(regionalOrgs); - const regionalTreats = regional_treaties.filter( - (item) => foundCountry.properties[item.name2] != "0" + const regionalTreats = regional_treaties + .filter((item) => foundCountry.properties[item.name2] !== "0") + .map((item) => { + return { + ...item, + state: foundCountry.properties[item.name2], + }; + }); + + const internationalTreats = international_treaties + .filter((item) => foundCountry.properties[item.name2] !== "0") + .map((item) => { + return { + ...item, + state: foundCountry.properties[item.name2], + }; + }); + + const internationalGuidelines = international_guidelines.filter( + (item) => foundCountry.properties[item.name2] === 1 ); + + const africanGuidelines = african_guidelines.filter( + (item) => foundCountry.properties[item.name2] === 1 + ); + setSelectedRegionalTreaties(regionalTreats); + setSelectedInternationalTreaties(internationalTreats); + setSelectedInternationalGuidelines(internationalGuidelines); + setSelectedAfricanGuidelines(africanGuidelines); } }, [data, countryID]); - useEffect(() => { - console.log(selectedRegionalTreaties); - }, [selectedRegionalTreaties]); + // useEffect(() => { + // console.log(selectedAfricanGuidelines) + // }, [selectedAfricanGuidelines]); if (isLoading) { return
Loading...
; @@ -186,7 +213,7 @@ const DetailesSection = (props) => {

{selectedCountry.properties.name}

- Regional Organisations:{" "} + Regional Organisations: {selectedRegionalOrganisations.map((item) => { return ( { ); })}

-

Regional Treaties: - {selectedRegionalTreaties.map((item) => { - return ( - - {item.name} - - ); - })} -

-

International Treaties:

-

International Guidelines & Instruments:

-

African Guidelines & Instrumentss:

+ + + + + + + + + + + + + + + + + +
+ Regional Treaties: + + + {selectedRegionalTreaties.map((item) => { + return ( + + + + + + ); + })} +
{item.name}{item.state} + +
+
+ International Treaties: + + + {selectedInternationalTreaties.map((item) => { + return ( + + + + + + ); + })} +
{item.name}{item.state} + +
+
+ International Guidelines & Instruments: + + + {selectedInternationalGuidelines.map((item) => { + return ( + + + + + ); + })} +
+ {item.name} + + +
+
+ African Guidelines & Instrumentss: + + + {selectedAfricanGuidelines.map((item) => { + return ( + + + + + ); + })} +
+ {item.name} + + +
+
)} diff --git a/src/Components/Layout/ControlInAfrica/MapInfoBox.jsx b/src/Components/Layout/ControlInAfrica/MapInfoBox.jsx new file mode 100644 index 0000000..06932f9 --- /dev/null +++ b/src/Components/Layout/ControlInAfrica/MapInfoBox.jsx @@ -0,0 +1,179 @@ +import React from "react"; + +const MapInfoBox = (props) => { + const regional_treaties = props.info.organisationsRegionalTreaties; + const international_treaties = props.info.organisationsInternationalTreaties; + const instruments = props.info.organisationsInstruments; + console.log(regional_treaties); + return ( +
+

{props.selectedRegion}

+

Number of countries

+
+ + + + + + + + + {regional_treaties && + regional_treaties.map((item, index) => { + return ( + + + + + + + ); + })} + + {international_treaties && + international_treaties.map((item, index) => { + return ( + + + + + + + ); + })} + +
+ Signed + + Eligible + + Ratified +
{item.name} + {item.signed} + + {item.eligible} + + {item.ratified} +
{item.name} + {item.signed} + + {item.eligible} + + {item.ratified} +
+
+ {instruments && + instruments.map((item, index) => { + return ( +

+ {item.name}:{" "} + + {item.countries} + +

+ ); + })} +
+ ); +}; + +export default MapInfoBox; + +//{regional_treaties && +// regional_treaties.map((item, index) => { +// return ( +//
+//

+// {item.name} Signed: {item.signed}, Eligible:{" "} +// {item.eligible}, Ratified: {item.ratified} +//

+//
+// ); +// })} +// {international_treaties && +// international_treaties.map((item, index) => { +// return ( +//
+//

+// {item.name} Signed: {item.signed}, Eligible:{" "} +// {item.eligible}, Ratified: {item.ratified} +//

+//
+// ); +// })} diff --git a/src/Data/ControlinAfrica.geojson b/src/Data/ControlinAfrica.geojson index 6c2b002..72dc10a 100644 --- a/src/Data/ControlinAfrica.geojson +++ b/src/Data/ControlinAfrica.geojson @@ -1,5 +1,9 @@ { "type": "FeatureCollection", + "crs": { + "type": "name", + "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } + }, "features": [ { "type": "Feature", @@ -39,7 +43,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 1, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -431,7 +440,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 1 }, "geometry": { "type": "MultiPolygon", @@ -559,7 +573,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -738,7 +757,7 @@ "IGAD": 0.0, "UMA": 0.0, "COMESA": 0.0, - "ECOWAS": 0.0, + "ECOWAS": 1.0, "CEN-SAD": 1.0, "SADC": 0.0, "ECCAS": 0.0, @@ -756,7 +775,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -1045,7 +1069,7 @@ "CEN-SAD": 0.0, "SADC": 1.0, "ECCAS": 0.0, - "ICGLR": 1.0, + "ICGLR": 0.0, "RECSA": 0.0, "SARCOM": 0.0, "BamakoDeclaration": "Signed", @@ -1059,7 +1083,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 1, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -1330,7 +1359,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 1 }, "geometry": { "type": "MultiPolygon", @@ -1704,7 +1738,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -2050,9 +2089,14 @@ "ArmsTradeTreaty": "Ratified", "FirearmsProtocol": "Eligible", "WassenaarAgreement": "Eligible", - "UNProgrammeofAction": 1.0, + "UNProgrammeofAction": 0.0, "InternationalTracingInstrument": 0.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 1 }, "geometry": { "type": "MultiPolygon", @@ -2442,7 +2486,7 @@ "RECSA": 1.0, "SARCOM": 1.0, "BamakoDeclaration": "Signed", - "KinshasaConvention": "Eligible", + "KinshasaConvention": "Signed", "ECOWASConvention": "0", "KhartoumDeclaration": "Signed", "NairobiProtocol": "Signed", @@ -2452,7 +2496,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 1 }, "geometry": { "type": "MultiPolygon", @@ -3140,7 +3189,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 1 }, "geometry": { "type": "MultiPolygon", @@ -3513,7 +3567,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -3606,7 +3665,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -3771,7 +3835,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 0.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -3877,7 +3946,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 1, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -4312,7 +4386,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 1, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -4615,7 +4694,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -4851,7 +4935,7 @@ "CEN-SAD": 0.0, "SADC": 0.0, "ECCAS": 0.0, - "ICGLR": 1.0, + "ICGLR": 0.0, "RECSA": 1.0, "SARCOM": 0.0, "BamakoDeclaration": "Signed", @@ -4865,7 +4949,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 0.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -5215,9 +5304,14 @@ "ArmsTradeTreaty": "Signed", "FirearmsProtocol": "Ratified", "WassenaarAgreement": "Eligible", - "UNProgrammeofAction": 1.0, + "UNProgrammeofAction": 0.0, "InternationalTracingInstrument": 0.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 1 }, "geometry": { "type": "MultiPolygon", @@ -5538,7 +5632,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -5801,7 +5900,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -6199,7 +6303,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -6320,9 +6429,14 @@ "ArmsTradeTreaty": "Ratified", "FirearmsProtocol": "Ratified", "WassenaarAgreement": "Eligible", - "UNProgrammeofAction": 0.0, + "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 0.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -6551,7 +6665,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 0.0, "InternationalTracingInstrument": 0.0, - "StG-PoA": 0.0 + "StG-PoA": 0.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 1 }, "geometry": { "type": "MultiPolygon", @@ -6672,7 +6791,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -6976,7 +7100,7 @@ "ECCAS": 0.0, "ICGLR": 0.0, "RECSA": 0.0, - "SARCOM": 1.0, + "SARCOM": 0.0, "BamakoDeclaration": "Signed", "KinshasaConvention": "0", "ECOWASConvention": "Signed", @@ -6988,7 +7112,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -7177,7 +7306,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 0.0, "InternationalTracingInstrument": 0.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 1, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -7482,9 +7616,14 @@ "ArmsTradeTreaty": "Ratified", "FirearmsProtocol": "Ratified", "WassenaarAgreement": "Eligible", - "UNProgrammeofAction": 1.0, + "UNProgrammeofAction": 0.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 1, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -7611,7 +7750,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 1, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -7921,7 +8065,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -8227,7 +8376,7 @@ "IGAD": 0.0, "UMA": 0.0, "COMESA": 0.0, - "ECOWAS": 0.0, + "ECOWAS": 1.0, "CEN-SAD": 1.0, "SADC": 0.0, "ECCAS": 0.0, @@ -8245,7 +8394,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -8755,7 +8909,7 @@ "CEN-SAD": 0.0, "SADC": 1.0, "ECCAS": 0.0, - "ICGLR": 1.0, + "ICGLR": 0.0, "RECSA": 0.0, "SARCOM": 0.0, "BamakoDeclaration": "Signed", @@ -8769,7 +8923,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 1, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -9274,7 +9433,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 1, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -9701,7 +9865,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -9756,7 +9925,7 @@ "CEN-SAD": 0.0, "SADC": 1.0, "ECCAS": 0.0, - "ICGLR": 1.0, + "ICGLR": 0.0, "RECSA": 0.0, "SARCOM": 0.0, "BamakoDeclaration": "Signed", @@ -9770,7 +9939,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 0.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 1, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -10121,7 +10295,7 @@ "CEN-SAD": 0.0, "SADC": 1.0, "ECCAS": 0.0, - "ICGLR": 1.0, + "ICGLR": 0.0, "RECSA": 0.0, "SARCOM": 0.0, "BamakoDeclaration": "Signed", @@ -10135,7 +10309,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 1, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -10402,7 +10581,7 @@ "IGAD": 0.0, "UMA": 0.0, "COMESA": 0.0, - "ECOWAS": 0.0, + "ECOWAS": 1.0, "CEN-SAD": 1.0, "SADC": 0.0, "ECCAS": 0.0, @@ -10420,7 +10599,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -10725,7 +10909,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -11129,7 +11318,7 @@ "CEN-SAD": 0.0, "SADC": 0.0, "ECCAS": 1.0, - "ICGLR": 0.0, + "ICGLR": 1.0, "RECSA": 1.0, "SARCOM": 0.0, "BamakoDeclaration": "Signed", @@ -11143,7 +11332,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -11281,7 +11475,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -11778,7 +11977,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -12071,7 +12275,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -12251,7 +12460,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -12496,7 +12710,12 @@ "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -12870,9 +13089,14 @@ "ArmsTradeTreaty": "Signed", "FirearmsProtocol": "Ratified", "WassenaarAgreement": "Eligible", - "UNProgrammeofAction": 1.0, + "UNProgrammeofAction": 0.0, "InternationalTracingInstrument": 0.0, - "StG-PoA": 1.0 + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 1 }, "geometry": { "type": "MultiPolygon", @@ -12937,18 +13161,23 @@ "ICGLR": 0.0, "RECSA": 0.0, "SARCOM": 0.0, - "BamakoDeclaration": null, - "KinshasaConvention": null, - "ECOWASConvention": null, - "KhartoumDeclaration": null, - "NairobiProtocol": null, - "SADCFirearmsProtocol": "Ratified", + "BamakoDeclaration": "Signed", + "KinshasaConvention": "0", + "ECOWASConvention": "0", + "KhartoumDeclaration": "0", + "NairobiProtocol": "0", + "SADCFirearmsProtocol": "Signed", "ArmsTradeTreaty": "Signed", "FirearmsProtocol": "Ratified", - "WassenaarAgreement": null, + "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": null + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 1, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -13024,19 +13253,24 @@ "ECCAS": 0.0, "ICGLR": 0.0, "RECSA": 1.0, - "SARCOM": 0.0, - "BamakoDeclaration": null, - "KinshasaConvention": null, - "ECOWASConvention": null, - "KhartoumDeclaration": null, + "SARCOM": 1.0, + "BamakoDeclaration": "Signed", + "KinshasaConvention": "0", + "ECOWASConvention": "0", + "KhartoumDeclaration": "0", "NairobiProtocol": "Signed", - "SADCFirearmsProtocol": null, + "SADCFirearmsProtocol": "Signed", "ArmsTradeTreaty": "Ratified", "FirearmsProtocol": "Signed", - "WassenaarAgreement": null, - "UNProgrammeofAction": null, - "InternationalTracingInstrument": null, - "StG-PoA": null + "WassenaarAgreement": "Eligible", + "UNProgrammeofAction": 0.0, + "InternationalTracingInstrument": 0.0, + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -13082,19 +13316,24 @@ "ECCAS": 1.0, "ICGLR": 0.0, "RECSA": 0.0, - "SARCOM": 0.0, - "BamakoDeclaration": null, - "KinshasaConvention": null, - "ECOWASConvention": null, - "KhartoumDeclaration": null, - "NairobiProtocol": null, - "SADCFirearmsProtocol": null, + "SARCOM": 1.0, + "BamakoDeclaration": "Signed", + "KinshasaConvention": "Ratified", + "ECOWASConvention": "0", + "KhartoumDeclaration": "Signed", + "NairobiProtocol": "0", + "SADCFirearmsProtocol": "0", "ArmsTradeTreaty": "Ratified", - "FirearmsProtocol": "0", - "WassenaarAgreement": null, - "UNProgrammeofAction": 1.0, - "InternationalTracingInstrument": null, - "StG-PoA": null + "FirearmsProtocol": "Eligible", + "WassenaarAgreement": "Eligible", + "UNProgrammeofAction": 0.0, + "InternationalTracingInstrument": 0.0, + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 1 }, "geometry": { "type": "MultiPolygon", @@ -13424,18 +13663,23 @@ "ICGLR": 0.0, "RECSA": 0.0, "SARCOM": 0.0, - "BamakoDeclaration": null, - "KinshasaConvention": null, - "ECOWASConvention": null, - "KhartoumDeclaration": null, - "NairobiProtocol": null, - "SADCFirearmsProtocol": null, + "BamakoDeclaration": "Signed", + "KinshasaConvention": "0", + "ECOWASConvention": "Signed", + "KhartoumDeclaration": "0", + "NairobiProtocol": "0", + "SADCFirearmsProtocol": "0", "ArmsTradeTreaty": "Ratified", "FirearmsProtocol": "Ratified", - "WassenaarAgreement": null, + "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, - "InternationalTracingInstrument": null, - "StG-PoA": null + "InternationalTracingInstrument": 1.0, + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 1, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -13604,18 +13848,23 @@ "ICGLR": 0.0, "RECSA": 0.0, "SARCOM": 0.0, - "BamakoDeclaration": null, - "KinshasaConvention": null, - "ECOWASConvention": null, - "KhartoumDeclaration": null, - "NairobiProtocol": null, - "SADCFirearmsProtocol": null, - "ArmsTradeTreaty": "0", + "BamakoDeclaration": "Signed", + "KinshasaConvention": "0", + "ECOWASConvention": "0", + "KhartoumDeclaration": "0", + "NairobiProtocol": "0", + "SADCFirearmsProtocol": "0", + "ArmsTradeTreaty": "Eligible", "FirearmsProtocol": "Ratified", - "WassenaarAgreement": null, - "UNProgrammeofAction": 1.0, - "InternationalTracingInstrument": null, - "StG-PoA": null + "WassenaarAgreement": "Eligible", + "UNProgrammeofAction": 0.0, + "InternationalTracingInstrument": 0.0, + "StG-PoA": 1.0, + "Northern-Africa": 1, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -13848,18 +14097,23 @@ "ICGLR": 1.0, "RECSA": 1.0, "SARCOM": 0.0, - "BamakoDeclaration": null, - "KinshasaConvention": null, - "ECOWASConvention": null, - "KhartoumDeclaration": null, + "BamakoDeclaration": "Signed", + "KinshasaConvention": "0", + "ECOWASConvention": "0", + "KhartoumDeclaration": "0", "NairobiProtocol": "Signed", "SADCFirearmsProtocol": "Ratified", "ArmsTradeTreaty": "Signed", "FirearmsProtocol": "Ratified", - "WassenaarAgreement": null, - "UNProgrammeofAction": 1.0, + "WassenaarAgreement": "Eligible", + "UNProgrammeofAction": 0.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": null + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -14444,18 +14698,23 @@ "ICGLR": 1.0, "RECSA": 1.0, "SARCOM": 0.0, - "BamakoDeclaration": null, - "KinshasaConvention": null, - "ECOWASConvention": null, - "KhartoumDeclaration": null, + "BamakoDeclaration": "Signed", + "KinshasaConvention": "0", + "ECOWASConvention": "0", + "KhartoumDeclaration": "0", "NairobiProtocol": "Signed", - "SADCFirearmsProtocol": null, - "ArmsTradeTreaty": "0", + "SADCFirearmsProtocol": "0", + "ArmsTradeTreaty": "Eligible", "FirearmsProtocol": "Ratified", - "WassenaarAgreement": null, + "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": null + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 1, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -14802,18 +15061,23 @@ "ICGLR": 0.0, "RECSA": 0.0, "SARCOM": 0.0, - "BamakoDeclaration": null, - "KinshasaConvention": null, - "ECOWASConvention": null, - "KhartoumDeclaration": null, - "NairobiProtocol": null, - "SADCFirearmsProtocol": null, + "BamakoDeclaration": "Signed", + "KinshasaConvention": "0", + "ECOWASConvention": "0", + "KhartoumDeclaration": "0", + "NairobiProtocol": "0", + "SADCFirearmsProtocol": "Ratified", "ArmsTradeTreaty": "Ratified", "FirearmsProtocol": "Ratified", - "WassenaarAgreement": null, + "WassenaarAgreement": "Ratified", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": null + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 1, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -15300,18 +15564,23 @@ "ICGLR": 1.0, "RECSA": 0.0, "SARCOM": 0.0, - "BamakoDeclaration": null, - "KinshasaConvention": null, - "ECOWASConvention": null, - "KhartoumDeclaration": null, - "NairobiProtocol": null, - "SADCFirearmsProtocol": "Ratified", + "BamakoDeclaration": "Signed", + "KinshasaConvention": "0", + "ECOWASConvention": "0", + "KhartoumDeclaration": "0", + "NairobiProtocol": "0", + "SADCFirearmsProtocol": "Signed", "ArmsTradeTreaty": "Ratified", "FirearmsProtocol": "Ratified", - "WassenaarAgreement": null, + "WassenaarAgreement": "Eligible", "UNProgrammeofAction": 1.0, "InternationalTracingInstrument": 1.0, - "StG-PoA": null + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 1, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -15794,21 +16063,26 @@ "CEN-SAD": 0.0, "SADC": 1.0, "ECCAS": 0.0, - "ICGLR": 1.0, + "ICGLR": 0.0, "RECSA": 0.0, "SARCOM": 0.0, - "BamakoDeclaration": null, - "KinshasaConvention": null, - "ECOWASConvention": null, - "KhartoumDeclaration": null, - "NairobiProtocol": null, - "SADCFirearmsProtocol": "Ratified", + "BamakoDeclaration": "Signed", + "KinshasaConvention": "0", + "ECOWASConvention": "0", + "KhartoumDeclaration": "0", + "NairobiProtocol": "0", + "SADCFirearmsProtocol": "Signed", "ArmsTradeTreaty": "Signed", - "FirearmsProtocol": "0", - "WassenaarAgreement": null, - "UNProgrammeofAction": 1.0, + "FirearmsProtocol": "Eligible", + "WassenaarAgreement": "Eligible", + "UNProgrammeofAction": 0.0, "InternationalTracingInstrument": 0.0, - "StG-PoA": null + "StG-PoA": 1.0, + "Northern-Africa": 0, + "Eastern-Africa": 0, + "Southern-Africa": 1, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", @@ -16077,29 +16351,34 @@ "count": 0, "name_y": "Western Sahara", "AU": 1, - "EAC": null, - "IGAD": null, - "UMA": null, - "COMESA": null, - "ECOWAS": null, - "CEN-SAD": null, - "SADC": null, - "ECCAS": null, - "ICGLR": null, - "RECSA": null, - "SARCOM": null, - "BamakoDeclaration": null, - "KinshasaConvention": null, - "ECOWASConvention": null, - "KhartoumDeclaration": null, - "NairobiProtocol": null, - "SADCFirearmsProtocol": null, - "ArmsTradeTreaty": null, - "FirearmsProtocol": null, - "WassenaarAgreement": null, - "UNProgrammeofAction": null, - "InternationalTracingInstrument": null, - "StG-PoA": null + "EAC": 0, + "IGAD": 0, + "UMA": 0, + "COMESA": 0, + "ECOWAS": 0, + "CEN-SAD": 0, + "SADC": 0, + "ECCAS": 0, + "ICGLR": 0, + "RECSA": 0, + "SARCOM": 0, + "BamakoDeclaration": "0", + "KinshasaConvention": "0", + "ECOWASConvention": "0", + "KhartoumDeclaration": "0", + "NairobiProtocol": "0", + "SADCFirearmsProtocol": "0", + "ArmsTradeTreaty": "0", + "FirearmsProtocol": "0", + "WassenaarAgreement": "0", + "UNProgrammeofAction": 0, + "InternationalTracingInstrument": 0, + "StG-PoA": 0, + "Northern-Africa": 1, + "Eastern-Africa": 0, + "Southern-Africa": 0, + "Western-Africa": 0, + "Central-Africa": 0 }, "geometry": { "type": "MultiPolygon", diff --git a/src/Styles/Layout/_filters.scss b/src/Styles/Layout/_filters.scss index 94572ad..5ccd379 100644 --- a/src/Styles/Layout/_filters.scss +++ b/src/Styles/Layout/_filters.scss @@ -1,5 +1,6 @@ .filters-box { padding: $gap; + border: 1px solid $border-color; } // _organizations diff --git a/src/Styles/Layout/_info_section.scss b/src/Styles/Layout/_info_section.scss new file mode 100644 index 0000000..a51c773 --- /dev/null +++ b/src/Styles/Layout/_info_section.scss @@ -0,0 +1,4 @@ +.section-icon{ + width: $icon-size-large; +} + diff --git a/src/Styles/Layout/_map.scss b/src/Styles/Layout/_map.scss index 354c02c..6abcb0a 100644 --- a/src/Styles/Layout/_map.scss +++ b/src/Styles/Layout/_map.scss @@ -1,5 +1,5 @@ .map-filter-box { - border: 1px solid $border-color; + // border: 1px solid $border-color; } .leaflet-container { @@ -7,7 +7,9 @@ } .map-container { + border: 1px solid $border-color; width: 100%; height: 100vh; + margin-top: 0px; } \ No newline at end of file diff --git a/src/Styles/Layout/_map_info_box.scss b/src/Styles/Layout/_map_info_box.scss new file mode 100644 index 0000000..7d9f9a7 --- /dev/null +++ b/src/Styles/Layout/_map_info_box.scss @@ -0,0 +1,12 @@ +.info-box { + position: absolute; + bottom: 20px; + left: 20px; + background-color: white; + padding: 10px; + border: 1px solid #ccc; + border-radius: 4px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); + z-index: 1000; + //width: 250px; + } \ No newline at end of file diff --git a/src/Styles/main.scss b/src/Styles/main.scss index b855f93..d200d57 100644 --- a/src/Styles/main.scss +++ b/src/Styles/main.scss @@ -13,6 +13,8 @@ @import 'Layout/map'; @import 'Layout/tooltips'; @import 'Layout/map_pssm'; +@import 'Layout/info_section'; +@import 'Layout/_map_info_box'; // Import other layout partials... // Components diff --git a/src/tmp/code.txt b/src/tmp/code.txt new file mode 100644 index 0000000..a5598ef --- /dev/null +++ b/src/tmp/code.txt @@ -0,0 +1,82 @@ +{(feature.properties[org.name2] === "Eligible" && ( + +)) || (feature.properties[org.name2] === "Signed" && ( + +)) || (feature.properties[org.name2] === "Ratified" && ( + +))} + + +{(feature.properties[org.name2] === + "Eligible" && ( + +)) || + (feature.properties[org.name2] === "Signed" && ( + + )) || + (feature.properties[org.name2] === + "Ratified" && ( + + ))} + + + + + Regional Treaties: + + {selectedRegionalTreaties.map((item) => { + return ( + + + + + + ); + })} +
{item.name}{item.state} + +
+ + + International Treaties: + + {selectedInternationalTreaties.map((item) => { + return ( + + + + + + ); + })} +
{item.name}{item.state} + +
+ \ No newline at end of file