Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Geometries] Removes current geometry creation files and scripts #3576

Merged
merged 4 commits into from
Dec 8, 2021

Conversation

Kongkille
Copy link
Contributor

Related to #3545

This PR removes all geometry scripts that are used to generate world.json and zonegeometries:

  • Changes to the dockerfile, such that docker build doesn't try to generate the map
  • Removes all geo scripts except for 'generate-zone-bounding-boxes'
  • Removes all third party maps

This means that after this merge, we cannot regenerate world.json and zonegeometries using the current method, however nothing else should break.

When we merge #3545 we can start generating new worlds again!


ADD web/src/world.json ./src/world.json
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am wondering whether this line still needs to be there?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you test it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to build with and without with no apparent destruction, but I don't understand docker all that well. @skovhus would you know?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be redundant as line 22 should take care of this. But let us leave it here for now.

@Kongkille Kongkille enabled auto-merge (squash) December 8, 2021 09:39
@Kongkille Kongkille merged commit b97fe26 into master Dec 8, 2021
@Kongkille Kongkille deleted the (MK)-remove-geocode branch December 8, 2021 09:46
@madsnedergaard
Copy link
Member

Shouldn't this have waited with merging until the other PR is done? 🤔

@Kongkille
Copy link
Contributor Author

The purpose of it was to be able to be done regardless, as I thought zonegeometries could just be 'left' in public/dist as a static file, but it seems it only appears after it's been build.

madsnedergaard added a commit that referenced this pull request Dec 10, 2021
skovhus pushed a commit that referenced this pull request Jan 5, 2022
* Remove map generation from dockerfile

* remove geo scripts

* Remove third party maps
skovhus added a commit that referenced this pull request Jan 6, 2022
* added skeleton

* add world.geojson

* utlity methods

* Update updateworld.js

* added min area for holes

* Update updateworld.js

* Add turf as dev dependency

* Check for ensureNoNeighbouringIds

* Add check for consistency with zones.json

* Update updateworld.js

* Add countOverlaps

* Add validateProperties

* added detectchanges script

* setup architecture

* update

* Add topojson file generation

* Create a brave new world.geojson

* Update zones properties with world_updated.py

* Updated new_world.geojson with desired properties

* added logging

* Add script for adding zone with geometries to zones.json

* Remove zone_matching.py

* Update zones_matching.py

* Remove updated zones_matching.py

* Use JsonFilePatcher

* Remove zones_matching again

* some linting

* update world file

* Test that output is valid for the app

* Remove old geo code

* use world.geojson for generating bounding boxes

* delete

* Added Readme

* name changes

* Revert "Remove old geo code"

This reverts commit 329e634.

* Revert "delete"

This reverts commit c4ac853.

* Delete world.topojson

* unchange world file

* clean

* lint

* Update web/geo/README.md

Co-authored-by: Kenneth Skovhus <skovhus@users.noreply.github.com>

* added npm script and added topojson to dev dependencies

* added test world for validate testing

* format and update utilities

* format and update validate

* format and update detect changes

* Update update-world.js

* lint

* [Geometries] Removes current geometry creation files and scripts (#3576)

* Remove map generation from dockerfile

* remove geo scripts

* Remove third party maps

* Fix topogen usage (#3593)

* Fix comparison script

* Update world.json based on geojson

* Fix bounding box script

* Add final check for zones.json compat

* Update web/geo/files.js

Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com>

* Remove detect changes (world.json should always be up to date)

* Verify world.json is up to date on CI

* Add comment to validation function

Co-authored-by: Pierre Segonne <pierre.segonne@tmrow.com>
Co-authored-by: Kenneth Skovhus <skovhus@users.noreply.github.com>
Co-authored-by: tmrow-bot <kenneth.skovhus@gmail.com>
Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com>
pierresegonne pushed a commit that referenced this pull request Feb 23, 2022
* Remove map generation from dockerfile

* remove geo scripts

* Remove third party maps
pierresegonne added a commit that referenced this pull request Feb 23, 2022
* added skeleton

* add world.geojson

* utlity methods

* Update updateworld.js

* added min area for holes

* Update updateworld.js

* Add turf as dev dependency

* Check for ensureNoNeighbouringIds

* Add check for consistency with zones.json

* Update updateworld.js

* Add countOverlaps

* Add validateProperties

* added detectchanges script

* setup architecture

* update

* Add topojson file generation

* Create a brave new world.geojson

* Update zones properties with world_updated.py

* Updated new_world.geojson with desired properties

* added logging

* Add script for adding zone with geometries to zones.json

* Remove zone_matching.py

* Update zones_matching.py

* Remove updated zones_matching.py

* Use JsonFilePatcher

* Remove zones_matching again

* some linting

* update world file

* Test that output is valid for the app

* Remove old geo code

* use world.geojson for generating bounding boxes

* delete

* Added Readme

* name changes

* Revert "Remove old geo code"

This reverts commit 329e634.

* Revert "delete"

This reverts commit c4ac853.

* Delete world.topojson

* unchange world file

* clean

* lint

* Update web/geo/README.md

Co-authored-by: Kenneth Skovhus <skovhus@users.noreply.github.com>

* added npm script and added topojson to dev dependencies

* added test world for validate testing

* format and update utilities

* format and update validate

* format and update detect changes

* Update update-world.js

* lint

* [Geometries] Removes current geometry creation files and scripts (#3576)

* Remove map generation from dockerfile

* remove geo scripts

* Remove third party maps

* Fix topogen usage (#3593)

* Fix comparison script

* Update world.json based on geojson

* Fix bounding box script

* Add final check for zones.json compat

* Update web/geo/files.js

Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com>

* Remove detect changes (world.json should always be up to date)

* Verify world.json is up to date on CI

* Add comment to validation function

Co-authored-by: Pierre Segonne <pierre.segonne@tmrow.com>
Co-authored-by: Kenneth Skovhus <skovhus@users.noreply.github.com>
Co-authored-by: tmrow-bot <kenneth.skovhus@gmail.com>
Co-authored-by: Mads Nedergaard <nedergaardmads@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants