[generator] World lines: adjust short lines filtering, merge motorways into trunks #5655

pastk · 2023-08-05T13:07:38Z

pastk commented

2023-08-05 13:07:38 +00:00

It'll allow for more efficient lines merging.

vng (Migrated from github.com) reviewed 2023-11-30 12:00:57 +00:00

vng (Migrated from github.com) left a comment

Remove "Discard metadata for World areas" ?

generator/feature_merger.cpp

vng (Migrated from github.com) commented

2023-11-30 11:54:03 +00:00

This will not work as expected. Return pr here and replace greater with less on the caller side.

DBL_MAX - 1.0E5 == DBL_MAX

This will not work as expected. Return pr here and replace greater with less on the caller side. DBL_MAX - 1.0E5 == DBL_MAX

generator/world_map_generator.hpp

vng (Migrated from github.com) commented

2023-11-30 11:59:09 +00:00

I doubt that we need this change

pastk reviewed 2023-11-30 12:10:35 +00:00

generator/world_map_generator.hpp

pastk commented

2023-11-30 12:10:34 +00:00

Why not? Why keep unnecessary data?
(I don't expect any major savings of course)

Why not? Why keep unnecessary data? (I don't expect any major savings of course)

vng (Migrated from github.com) reviewed 2023-11-30 12:15:08 +00:00

generator/world_map_generator.hpp

vng (Migrated from github.com) commented

2023-11-30 12:15:08 +00:00

I don't like the way it is made
I suspect we should store meta for area at least in future

- I don't like the way it is made - I suspect we should store meta for area at least in future

pastk reviewed 2023-11-30 12:39:49 +00:00

generator/world_map_generator.hpp

pastk commented

2023-11-30 12:39:49 +00:00

what is the problem exactly? before my change the metadata removal was "hidden" in the lines specific feature merger code, now its in a more logical and visible place
then we can easily change it if needed (and we should keep only used metadata, not all metadata)

1. what is the problem exactly? before my change the metadata removal was "hidden" in the lines specific feature merger code, now its in a more logical and visible place 2. then we can easily change it if needed (and we should keep only **used** metadata, not **all** metadata)

vng (Migrated from github.com) reviewed 2023-11-30 12:44:42 +00:00

generator/world_map_generator.hpp

vng (Migrated from github.com) commented

2023-11-30 12:44:42 +00:00

I don't like this.

pastk reviewed 2023-11-30 14:54:19 +00:00

generator/world_map_generator.hpp

pastk commented

2023-11-30 14:54:19 +00:00

me too :) any idea how to make it better?

pastk reviewed 2023-11-30 14:55:30 +00:00

generator/world_map_generator.hpp

pastk commented

2023-11-30 14:55:29 +00:00

probably have to change the interface in many places to remove const :/

probably have to change the interface in many places to remove `const` :/

vng (Migrated from github.com) reviewed 2023-11-30 14:59:35 +00:00

generator/world_map_generator.hpp

vng (Migrated from github.com) commented

2023-11-30 14:59:35 +00:00

Let's remove this change in PR :)

pastk reviewed 2023-11-30 16:43:23 +00:00

generator/feature_merger.cpp

pastk commented

2023-11-30 16:43:23 +00:00

fixed

vng (Migrated from github.com) approved these changes 2023-11-30 16:47:36 +00:00

biodranik (Migrated from github.com) reviewed 2023-11-30 17:52:48 +00:00

biodranik (Migrated from github.com) left a comment

Did you test it?

generator/world_map_generator.hpp

					
				@ -57,1 +56,3 @@

				      if (scales::IsGoodForLevel(scales::GetUpperWorldScale(), fb.GetLimitRect()))

				      static const uint32_t ferryType = classif().GetTypeByPath({"route", "ferry"});

				      static const uint32_t boundaryType = classif().GetTypeByPath({"boundary", "administrative"});

				      static const uint32_t highwayType = classif().GetTypeByPath({"highway"});

biodranik (Migrated from github.com) commented

2023-11-30 17:52:22 +00:00

constexpr

generator/world_map_generator.hpp

biodranik (Migrated from github.com) commented

2023-11-30 17:52:09 +00:00

constexpr

pastk reviewed 2023-11-30 18:41:51 +00:00

generator/world_map_generator.hpp

pastk commented

2023-11-30 18:41:50 +00:00

generator/world_map_generator.hpp:126:50: error: no matching function for call to ‘FeatureTypesProcessor::SetMappingTypes(char* const [2], char* const [2])’
     m_typesCorrector.SetMappingTypes(marr1, marr2);

``` generator/world_map_generator.hpp:126:50: error: no matching function for call to ‘FeatureTypesProcessor::SetMappingTypes(char* const [2], char* const [2])’ m_typesCorrector.SetMappingTypes(marr1, marr2); ```

pastk reviewed 2023-11-30 18:42:37 +00:00

generator/world_map_generator.hpp

					
				@ -57,1 +56,3 @@

				      if (scales::IsGoodForLevel(scales::GetUpperWorldScale(), fb.GetLimitRect()))

				      static const uint32_t ferryType = classif().GetTypeByPath({"route", "ferry"});

				      static const uint32_t boundaryType = classif().GetTypeByPath({"boundary", "administrative"});

				      static const uint32_t highwayType = classif().GetTypeByPath({"highway"});

pastk commented

2023-11-30 18:42:37 +00:00

GetTypeByPath() is not constexpr

biodranik (Migrated from github.com) reviewed 2023-11-30 22:33:24 +00:00

generator/world_map_generator.hpp

biodranik (Migrated from github.com) commented

2023-11-30 22:33:24 +00:00

https://medium.com/@samathy_barratt/constantly-confusing-c-const-and-constexpr-pointer-behaviour-7eddb041e15a

biodranik (Migrated from github.com) reviewed 2023-11-30 22:34:31 +00:00

generator/world_map_generator.hpp

					
				@ -57,1 +56,3 @@

				      if (scales::IsGoodForLevel(scales::GetUpperWorldScale(), fb.GetLimitRect()))

				      static const uint32_t ferryType = classif().GetTypeByPath({"route", "ferry"});

				      static const uint32_t boundaryType = classif().GetTypeByPath({"boundary", "administrative"});

				      static const uint32_t highwayType = classif().GetTypeByPath({"highway"});