-
Notifications
You must be signed in to change notification settings - Fork 958
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
Simplify exceptions for aruba #1179
Simplify exceptions for aruba #1179
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the PR.
Can you post a screenshot just to be sure it works?
web/generate-geometries.js
Outdated
zoneDefinitions.forEach(zone => { | ||
// Take only zones being small simplified | ||
if (('lessSimplify' in zone) && zone.lessSimplify) { | ||
if (zone.zoneName in zonesLessSimplified || zone.zoneName in zones) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Identation problems?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok
docker-compose.yml
Outdated
@@ -27,3 +27,8 @@ services: | |||
- './web/webpack.config.js:/home/web/webpack.config.js' | |||
- './web/locales:/home/web/locales' | |||
- './config:/home/config' | |||
- './web/topogen.sh:/home/web/topogen.sh' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you sort alphabetically?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure
web/generate-geometries.js
Outdated
}); | ||
}); | ||
}); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you remove one or both blank lines?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK
web/generate-geometries.js
Outdated
topo2.arcs.forEach(arc=> { | ||
topo1.arcs.push(arc); | ||
}); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
again, can you remove both blank lines?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK
web/generate-geometries.js
Outdated
@@ -580,11 +596,44 @@ zoneFeatures = toListOfFeatures(zoneFeaturesInline); | |||
// Write unsimplified list of geojson, without state merges | |||
fs.writeFileSync('build/zonegeometries.json', zoneFeatures.map(JSON.stringify).join('\n')); | |||
|
|||
// Simplify | |||
// Adds the zones from topo2 to topo1 | |||
function mergeTopoJsonSingleZone(topo1, topo2) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you move the function definition above the script part (to line ~550)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I changed to moreDetails, zonesMoreDetails and topoMoreDetails that seems better for me as well.
this is great! I'd also like to see a screenshot of Aruba Island. Could you also post of Acores or Canaries so that we can see the differences? It might be nice to have a bit more precision on a few island (but we might not see a big difference due to the quantization step). Not a necessary change, I'm not a fan of the |
I tried to use moreDetails on Azores or Canaries but it produce the same geometries. As @maxbellec said, another operation may changes geometries. |
docker-compose.yml
Outdated
- './web/src:/home/web/src' | ||
- './web/locales:/home/web/locales' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you order alphabetically?
Fixes #1153
I added a parameter "lessSimplify" to zones to avoid too much simplification on small zones like Aruba.
Diffing world.json is very hard due to huge single line. As far as I can see, it only adds Aruba. I did not notice any other changes.
I also added unzip to docker container that is required by topogen.sh. Some other various files needed for development using container were added too.
Another point is the third_party_maps folder that is missing inside container and causes download map not working.
This PR works well. Naming and comments can be changed according to your coding standards.