Skip to content

Commit

Permalink
🏗 Restructure to isolate data related to a city (#20) + 🗃 Update data
Browse files Browse the repository at this point in the history
  • Loading branch information
jbelien committed Apr 25, 2020
1 parent 95ca230 commit f157bfb
Show file tree
Hide file tree
Showing 64 changed files with 166 additions and 133 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,5 +1,6 @@
.cache/
node_modules/
vendor/
data/
dist/
.env
1 change: 1 addition & 0 deletions cities/.gitignore
@@ -0,0 +1 @@
!*/data/
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
6 changes: 3 additions & 3 deletions resources/style.css → cities/brussels/assets/style.css
@@ -1,6 +1,6 @@
@import "../node_modules/@fortawesome/fontawesome-free/css/brands.css";
@import "../node_modules/@fortawesome/fontawesome-free/css/solid.css";
@import "../node_modules/@fortawesome/fontawesome-free/css/fontawesome.css";
@import "../../../node_modules/@fortawesome/fontawesome-free/css/brands.css";
@import "../../../node_modules/@fortawesome/fontawesome-free/css/solid.css";
@import "../../../node_modules/@fortawesome/fontawesome-free/css/fontawesome.css";

html,
body {
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes.
40 changes: 21 additions & 19 deletions static/gender.csv → cities/brussels/data/gender.csv
@@ -1,6 +1,7 @@
name_fr,name_nl,gender,wikidata,type
"Avenue Albert-Elisabeth",Albert-Elisabethlaan,+,Q55008046;Q235186,relation
"Avenue Pierre et Marie Curie","Pierre en Marie Curielaan",+,Q37463;Q7186,relation
"Avenue Tedesco",Tedescolaan,+,Q91870858;Q91870861;Q91871003,way
"Rue Albert et Marie-Louise Servais-Kinet","Albert en Marie-Louise Servais-Kinetstraat",+,Q89366028;Q89366128,relation
"Allée Clara Clairbert","Clara Clairbertdreef",F,Q5125964,relation
"Allée Estelle Juste","Estelle Justedreef",F,Q38031104,way
Expand Down Expand Up @@ -544,24 +545,42 @@ name_fr,name_nl,gender,wikidata,type
"Avenue Pierre Devis","Pierre Devislaan",M,Q3384746,way
"Avenue Pierre Vander Biest","Pierre Vander Biestlaan",M,Q91469338,relation
"Avenue Pierre d'Union","Pierre d'Unionlaan",M,Q3384861,way
"Avenue Pieter Goedefroy","Pieter Goedefroylaan",M,Q91639880,relation
"Avenue Platon",Platolaan,M,Q859,relation
"Avenue Prince Baudouin","Prins Boudewijnlaan",M,Q12976,relation
"Avenue Prudent Bols","Prudent Bolslaan",M,Q91640531,relation
"Avenue Ptolémée",Ptolemeelaan,M,Q34943,way
"Avenue Raymond Foucart","Raymond Foucartlaan",M,Q3420859,relation
"Avenue Raymond Vander Bruggen","Raymond Vander Bruggenlaan",M,Q91640833,relation
"Avenue Raymond de Meester","Raymond de Meesterlaan",M,Q3421231,relation
"Avenue René Berrewaerts","René Berrewaertslaan",M,Q91642094,relation
"Avenue René Comhaire","René Comhairelaan",M,Q91726940,relation
"Avenue René Coulbaut","René Coulbautlaan",M,Q91726941,way
"Avenue René Gobert","René Gobertlaan",M,Q59417463,way
"Avenue René Lyr","René Lyrlaan",M,Q3426571,way
"Avenue René Piret","René Piretlaan",M,Q91727212,relation
"Avenue René Stevens","René Stevenslaan",M,Q1913244,way
"Avenue Richard Mazza","Richard Mazzalaan",M,Q91728705,relation
"Avenue Richard Neybergh","Richard Neyberghlaan",M,Q91868952,relation
"Avenue Robert Dalechamp","Robert Dalechamplaan",M,Q91869044,relation
"Avenue Roger Hainaut","Roger Hainautlaan",M,Q91870559,way
"Avenue Roger Lallemand","Roger Lallemandlaan",M,Q466207,relation
"Avenue Roger Vandendriessche","Roger Vandendriesschelaan",M,Q61653837,way
"Avenue Rogier",Rogierlaan,M,Q468109,way
"Avenue Romain Rolland","Romain Rollandlaan",M,Q47162,relation
"Avenue Saint-Augustin",Sint-Augustinuslaan,M,Q8018,way
"Avenue Secrétin",Secrétinlaan,M,Q86088683,relation
"Avenue Seghers",Segherslaan,M,Q91870853,relation
"Avenue Sleeckx",Sleeckxlaan,M,Q670157,relation
"Avenue Stiénon",Stiénonlaan,M,Q86068066,relation
"Avenue Stuart Merrill","Stuart Merrilllaan",M,Q3087491,relation
"Avenue Théo Vanpé","Théo Vanpélaan",M,Q91871785,way
"Avenue Théo Verbeeck","Théo Verbeecklaan",M,Q3332472,relation
"Avenue Thiriar",Thiriarlaan,M,Q15401517,relation
"Avenue Thomas Frissen","Thomas Frissenlaan",M,Q91872343,relation
"Avenue Tolstoï",Tolstoïlaan,M,Q7243,relation
"Avenue Van Praet","Van Praetlaan",M,Q3070531,relation
"Avenue Vanderaey",Vanderaeylaan,M,Q91872357,relation
"Avenue Verdi",Verdilaan,M,Q7317,relation
"Avenue Victor Gilsoul","Victor Gilsoullaan",M,Q2539498,relation
"Avenue Victor Jacobs","Victor Jacobslaan",M,Q3380316,relation
Expand Down Expand Up @@ -655,6 +674,7 @@ name_fr,name_nl,gender,wikidata,type
"Drève Joseph Vanderborght","Joseph Vanderborghtdreef",M,Q3185718,way
"Drève Recteur Van Waeyenbergh","Rector Van Waeyenberghdreef",M,Q2248867,way
"Drève Saint-Hubert",Sint-Hubertusdreef,M,Q159834,relation
"Esplanade Jacques Brel","Jacques Brelesplanade",M,Q1666,way
"Esplanade Paul-Henri Spaak","Paul-Henri Spaakvoorplein",M,Q155691,way
"Galerie Horta",Hortagalerij,M,Q49744,way
"Impasse Saint Sébastien",Sint-Sebastiaansgang,M,Q183332,way
Expand Down Expand Up @@ -1054,6 +1074,7 @@ name_fr,name_nl,gender,wikidata,type
"Rue Jacobs-Fontaine",Jacobs-Fontainestraat,M,Q3380316,relation
"Rue Jacques Bassem","Jacques Bassemstraat",M,Q3158201,way
"Rue Jacques Jordaens","Jakob Jordaensstraat",M,Q270658,way
"Rue Jacques Manne","Jacques Mannestraat",M,Q63160171,relation
"Rue Jacques Vandervleet","Jacques Vandervleetstraat",M,Q85472462,relation
"Rue Jacques de Lalaing","Jacques de Lalaingstraat",M,Q2130178,relation
"Rue Jakob Smits","Jakob Smitsstraat",M,Q3157590,relation
Expand Down Expand Up @@ -1453,26 +1474,7 @@ name_fr,name_nl,gender,wikidata,type
"Avenue Georges Henri","Georges Henrilaan",M,,relation
"Avenue Hansen-Soulie",Hansen-Soulielaan,M,,relation
"Avenue Père Hilaire","Pater Hilariuslaan",M,,relation
"Avenue Pieter Goedefroy","Pieter Goedefroylaan",M,,relation
"Avenue Prudent Bols","Prudent Bolslaan",M,,relation
"Avenue Raymond Vander Bruggen","Raymond Vander Bruggenlaan",M,,relation
"Avenue Raymond de Meester","Raymond de Meesterlaan",M,,relation
"Avenue René Berrewaerts","René Berrewaertslaan",M,,relation
"Avenue René Comhaire","René Comhairelaan",M,,relation
"Avenue René Coulbaut","René Coulbautlaan",M,,way
"Avenue René Piret","René Piretlaan",M,,relation
"Avenue René Stevens","René Stevenslaan",M,,way
"Avenue Richard Mazza","Richard Mazzalaan",M,,relation
"Avenue Richard Neybergh","Richard Neyberghlaan",M,,relation
"Avenue Robert Dalechamp","Robert Dalechamplaan",M,,relation
"Avenue Roger Hainaut","Roger Hainautlaan",M,,way
"Avenue Roger Vandendriessche","Roger Vandendriesschelaan",M,,way
"Avenue Saint-Jean",Sint-Janslaan,M,,relation
"Avenue Seghers",Segherslaan,M,,relation
"Avenue Tedesco",Tedescolaan,M,,way
"Avenue Théo Vanpé","Théo Vanpélaan",M,,way
"Avenue Thomas Frissen","Thomas Frissenlaan",M,,relation
"Avenue Vanderaey",Vanderaeylaan,M,,relation
"Avenue Vandromme",Vandrommelaan,M,,relation
"Avenue Victor Olivier","Victor Olivierlaan",M,,relation
"Avenue Victor Tahon","Victor Tahonlaan",M,,way
Expand Down
2 changes: 0 additions & 2 deletions static/other.csv → cities/brussels/data/other.csv
Expand Up @@ -82,7 +82,6 @@ name_fr,name_nl,gender,wikidata,type
Romeinsesteenweg,Romeinsesteenweg,,Q194029,way
"Rond-Point Boule et Bill","Bollie en Billierotonde",,Q59991,way
"Rue Guillaume Tell","Willem Tellstraat",,Q30908,relation
"Rue Jacques Manne","Jacques Mannestraat",,Q63160171,relation
"Rue Maes",Maesstraat,,Q49619000,relation
"Rue Ravenstein",Ravensteinstraat,,Q3145650,way
"Rue Saint-Michel",Sint-Michielsstraat,,Q45581,way
Expand Down Expand Up @@ -1182,7 +1181,6 @@ Duivenschietweg,Duivenschietweg,,,way
"Ensemble Jean Christophe","Ensemble Jean Christophe",,,relation
"Espace Louise","Espace Louise",,,way
Esplanade,Esplanade,,,relation
"Esplanade Jacques Brel","Jacques Brelesplanade",,,way
"Esplanade de l'Europe",Europaesplanade,,,relation
"Esplanade du Berlaymont",Esplanade,,,way
"F212 Fietssnelweg Asse-Brussel","F212 Fietssnelweg Asse-Brussel",,,way
Expand Down
1 change: 1 addition & 0 deletions cities/brussels/data/relations.geojson

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions cities/brussels/data/statistics.json
@@ -0,0 +1 @@
{"F":137,"M":1971,"FX":0,"MX":1,"X":0,"-":3157,"+":4}
1 change: 1 addition & 0 deletions cities/brussels/data/ways.geojson

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions public/en/index.html → cities/brussels/html/en/index.html
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="https://api.mapbox.com/mapbox-gl-js/v1.7.0/mapbox-gl.css">
<link rel="stylesheet"
href="https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-geocoder/v4.4.2/mapbox-gl-geocoder.css">
<link rel="stylesheet" href="../../resources/style.css">
<link rel="stylesheet" href="../../assets//style.css">

<title>EqualStreetNames.Brussels</title>
</head>
Expand Down Expand Up @@ -171,13 +171,13 @@ <h6>EqualStreetNames.Brussels is coordinated by</h6>
<div class="row">
<div class="col text-center">
<a target="_blank" href="https://openknowledge.be/">
<img alt="Open Knowledge Belgium" src="../../resources/logos/okbe.svg"
<img alt="Open Knowledge Belgium" src="../../assets/okbe.svg"
style="height: 150px;">
</a>
</div>
<div class="col text-center">
<a target="_blank" href="https://nomspeutetre.wordpress.com/">
<img alt="Noms Peut-Être !" src="../../resources/logos/nomspeutetre.png"
<img alt="Noms Peut-Être !" src="../../assets/nomspeutetre.png"
style="height: 150px;">
</a>
</div>
Expand All @@ -187,13 +187,13 @@ <h6>With the support of</h6>
<div class="row">
<div class="col text-center">
<a target="_blank" href="https://openstreetmap.be/">
<img alt="OpenStreetMap Belgium" src="../../resources/logos/osmbe.svg"
<img alt="OpenStreetMap Belgium" src="../../assets/osmbe.svg"
style="height: 150px;">
</a>
</div>
<div class="col text-center">
<a target="_blank" href="https://wikimedia.be/">
<img alt="Wikimedia Belgique" src="../../resources/logos/wikimediabe.svg"
<img alt="Wikimedia Belgique" src="../../assets/wikimediabe.svg"
style="height: 150px;">
</a>
</div>
Expand All @@ -202,7 +202,7 @@ <h6>With the support of</h6>
<h6>EqualStreetNames.Brussels is made possible thanks to</h6>
<div class="text-center">
<a target="_blank" href="http://equal.brussels/">
<img alt="equal.brussels" src="../../resources/logos/equalbrussels.svg">
<img alt="equal.brussels" src="../../assets/equalbrussels.svg">
</a>
</div>
</div>
Expand Down Expand Up @@ -340,7 +340,7 @@ <h5 class="modal-title">
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
crossorigin="anonymous"></script>
<script src="../../resources/index.ts"></script>
<script src="../../../../resources/index.ts"></script>
<!-- Fathom - simple website analytics - https://usefathom.com -->
<script>
(function (f, a, t, h, o, m) {
Expand Down
14 changes: 7 additions & 7 deletions public/fr/index.html → cities/brussels/html/fr/index.html
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="https://api.mapbox.com/mapbox-gl-js/v1.7.0/mapbox-gl.css">
<link rel="stylesheet"
href="https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-geocoder/v4.4.2/mapbox-gl-geocoder.css">
<link rel="stylesheet" href="../../resources/style.css">
<link rel="stylesheet" href="../../assets/style.css">

<title>EqualStreetNames.Brussels</title>
</head>
Expand Down Expand Up @@ -178,13 +178,13 @@ <h6>EqualStreetNames.Brussels est coordonné par</h6>
<div class="row">
<div class="col text-center">
<a target="_blank" href="https://openknowledge.be/">
<img alt="Open Knowledge Belgium" src="../../resources/logos/okbe.svg"
<img alt="Open Knowledge Belgium" src="../../assets/okbe.svg"
style="height: 150px;">
</a>
</div>
<div class="col text-center">
<a target="_blank" href="https://nomspeutetre.wordpress.com/">
<img alt="Noms Peut-Être !" src="../../resources/logos/nomspeutetre.png"
<img alt="Noms Peut-Être !" src="../../assets/nomspeutetre.png"
style="height: 150px;">
</a>
</div>
Expand All @@ -194,13 +194,13 @@ <h6>Avec le soutien de</h6>
<div class="row">
<div class="col text-center">
<a target="_blank" href="https://openstreetmap.be/">
<img alt="OpenStreetMap Belgium" src="../../resources/logos/osmbe.svg"
<img alt="OpenStreetMap Belgium" src="../../assets/osmbe.svg"
style="height: 150px;">
</a>
</div>
<div class="col text-center">
<a target="_blank" href="https://wikimedia.be/">
<img alt="Wikimedia Belgique" src="../../resources/logos/wikimediabe.svg"
<img alt="Wikimedia Belgique" src="../../assets/wikimediabe.svg"
style="height: 150px;">
</a>
</div>
Expand All @@ -209,7 +209,7 @@ <h6>Avec le soutien de</h6>
<h6>EqualStreetNames.Brussels est rendu possible grâce à</h6>
<div class="text-center">
<a target="_blank" href="http://equal.brussels/">
<img alt="equal.brussels" src="../../resources/logos/equalbrussels.svg">
<img alt="equal.brussels" src="../../assets/equalbrussels.svg">
</a>
</div>
</div>
Expand Down Expand Up @@ -347,7 +347,7 @@ <h5 class="modal-title">
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
crossorigin="anonymous"></script>
<script src="../../resources/index.ts"></script>
<script src="../../../../resources/index.ts"></script>
<!-- Fathom - simple website analytics - https://usefathom.com -->
<script>
(function (f, a, t, h, o, m) {
Expand Down
2 changes: 1 addition & 1 deletion public/index.html → cities/brussels/html/index.html
Expand Up @@ -18,7 +18,7 @@

<body class="d-flex align-items-center flex-column">

<img src="../resources/visual.png" alt="EqualStreetNames.Brussels">
<img src="../assets/visual.png" alt="EqualStreetNames.Brussels">

<div class="list-group text-center mt-3">
<a href="/en/index.html" class="list-group-item list-group-item-action">
Expand Down
14 changes: 7 additions & 7 deletions public/nl/index.html → cities/brussels/html/nl/index.html
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="https://api.mapbox.com/mapbox-gl-js/v1.7.0/mapbox-gl.css">
<link rel="stylesheet"
href="https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-geocoder/v4.4.2/mapbox-gl-geocoder.css">
<link rel="stylesheet" href="../../resources/style.css">
<link rel="stylesheet" href="../../assets/style.css">

<title>EqualStreetNames.Brussels</title>
</head>
Expand Down Expand Up @@ -178,13 +178,13 @@ <h6>EqualStreetNames.Brussels wordt gecoördineerd door</h6>
<div class="row">
<div class="col text-center">
<a target="_blank" href="https://openknowledge.be/">
<img alt="Open Knowledge Belgium" src="../../resources/logos/okbe.svg"
<img alt="Open Knowledge Belgium" src="../../assets/okbe.svg"
style="height: 150px;">
</a>
</div>
<div class="col text-center">
<a target="_blank" href="https://nomspeutetre.wordpress.com/">
<img alt="Noms Peut-Être !" src="../../resources/logos/nomspeutetre.png"
<img alt="Noms Peut-Être !" src="../../assets/nomspeutetre.png"
style="height: 150px;">
</a>
</div>
Expand All @@ -194,13 +194,13 @@ <h6>Met de steun van</h6>
<div class="row">
<div class="col text-center">
<a target="_blank" href="https://openstreetmap.be/">
<img alt="OpenStreetMap Belgium" src="../../resources/logos/osmbe.svg"
<img alt="OpenStreetMap Belgium" src="../../assets/osmbe.svg"
style="height: 150px;">
</a>
</div>
<div class="col text-center">
<a target="_blank" href="https://wikimedia.be/">
<img alt="Wikimedia Belgique" src="../../resources/logos/wikimediabe.svg"
<img alt="Wikimedia Belgique" src="../../assets/wikimediabe.svg"
style="height: 150px;">
</a>
</div>
Expand All @@ -209,7 +209,7 @@ <h6>Met de steun van</h6>
<h6>EqualStreetNames.Brussels wordt mogelijk gemaakt dankzij</h6>
<div class="text-center">
<a target="_blank" href="http://equal.brussels/">
<img alt="equal.brussels" src="../../resources/logos/equalbrussels.svg">
<img alt="equal.brussels" src="../../assets/equalbrussels.svg">
</a>
</div>
</div>
Expand Down Expand Up @@ -349,7 +349,7 @@ <h5 class="modal-title">
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
crossorigin="anonymous"></script>
<script src="../../resources/index.ts"></script>
<script src="../../../../resources/index.ts"></script>
<!-- Fathom - simple website analytics - https://usefathom.com -->
<script>
(function (f, a, t, h, o, m) {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 0 additions & 11 deletions data/.gitignore

This file was deleted.

7 changes: 0 additions & 7 deletions data/README.md

This file was deleted.

Empty file removed data/overpass/.gitkeep
Empty file.
Empty file removed data/wikidata/.gitkeep
Empty file.
9 changes: 5 additions & 4 deletions package.json
Expand Up @@ -7,8 +7,8 @@
"doc": "docs"
},
"scripts": {
"build": "parcel build public/index.html public/*/index.html --no-source-maps",
"serve": "parcel public/index.html public/*/index.html"
"build": "parcel build cities/brussels/**/index.html --no-source-maps",
"serve": "parcel cities/brussels/**/index.html"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -36,6 +36,7 @@
"mapbox-gl": "^1.9.1"
},
"staticFiles": {
"excludeGlob": "*.csv"
"excludeGlob": "*.{csv,md}",
"staticPath": "cities/brussels/data"
}
}
}

0 comments on commit f157bfb

Please sign in to comment.