From 1f53491009796fc54552e9f282eb0e225034d5fd Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Tue, 30 Aug 2016 14:59:53 -0700 Subject: [PATCH] Tile by layer names instead of by layer numbers --- ...s%named%alg_-Lalbania@tests%named%alb.json | 8 +- tile.cpp | 102 +++++++++--------- 2 files changed, 58 insertions(+), 52 deletions(-) diff --git a/tests/named/out/-z0_-Lalgeria@tests%named%alg_-Lalbania@tests%named%alb.json b/tests/named/out/-z0_-Lalgeria@tests%named%alg_-Lalbania@tests%named%alb.json index 5aabfd7..ba4da8c 100644 --- a/tests/named/out/-z0_-Lalgeria@tests%named%alg_-Lalbania@tests%named%alb.json +++ b/tests/named/out/-z0_-Lalgeria@tests%named%alg_-Lalbania@tests%named%alb.json @@ -11,14 +11,14 @@ "version": "2" }, "features": [ { "type": "FeatureCollection", "properties": { "zoom": 0, "x": 0, "y": 0 }, "features": [ -{ "type": "FeatureCollection", "properties": { "layer": "algeria", "version": 2, "extent": 4096 }, "features": [ -{ "type": "Feature", "properties": { "scalerank": 0, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Algeria", "sov_a3": "DZA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Algeria", "adm0_a3": "DZA", "geou_dif": 0, "geounit": "Algeria", "gu_a3": "DZA", "su_dif": 0, "subunit": "Algeria", "su_a3": "DZA", "brk_diff": 0, "name": "Algeria", "name_long": "Algeria", "brk_a3": "DZA", "brk_name": "Algeria", "abbrev": "Alg.", "postal": "DZ", "formal_en": "People's Democratic Republic of Algeria", "name_sort": "Algeria", "mapcolor7": 5, "mapcolor8": 1, "mapcolor9": 6, "mapcolor13": 3, "pop_est": 34178188, "gdp_md_est": 232900, "pop_year": -99, "lastcensus": 2008, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "DZ", "iso_a3": "DZA", "iso_n3": "012", "un_a3": "012", "wb_a2": "DZ", "wb_a3": "DZA", "woe_id": -99, "adm0_a3_is": "DZA", "adm0_a3_us": "DZA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Northern Africa", "region_wb": "Middle East & North Africa", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 6.767578, 36.949892 ], [ 7.119141, 36.949892 ], [ 7.207031, 37.090240 ], [ 7.734375, 37.020098 ], [ 7.734375, 36.879621 ], [ 7.998047, 36.879621 ], [ 8.173828, 37.020098 ], [ 8.525391, 36.949892 ], [ 8.613281, 36.879621 ], [ 8.349609, 36.809285 ], [ 8.437500, 36.738884 ], [ 8.085938, 36.527295 ], [ 8.349609, 36.456636 ], [ 8.173828, 35.960223 ], [ 8.349609, 35.317366 ], [ 8.173828, 34.957995 ], [ 8.261719, 34.813803 ], [ 8.173828, 34.597042 ], [ 7.470703, 34.161818 ], [ 7.470703, 33.724340 ], [ 7.646484, 33.284620 ], [ 8.085938, 33.137551 ], [ 8.261719, 32.546813 ], [ 9.052734, 32.026706 ], [ 9.492188, 30.297018 ], [ 9.228516, 30.145127 ], [ 9.492188, 29.840644 ], [ 9.843750, 28.998532 ], [ 9.755859, 28.226970 ], [ 9.931641, 27.839076 ], [ 9.667969, 27.371767 ], [ 9.843750, 26.588527 ], [ 9.404297, 26.431228 ], [ 9.316406, 26.115986 ], [ 10.019531, 25.324167 ], [ 10.019531, 24.846565 ], [ 10.195312, 24.766785 ], [ 10.195312, 24.607069 ], [ 11.513672, 24.367114 ], [ 11.953125, 23.563987 ], [ 7.734375, 21.125498 ], [ 5.888672, 19.559790 ], [ 3.251953, 18.979026 ], [ 3.076172, 19.145168 ], [ 3.076172, 19.311143 ], [ 3.251953, 19.394068 ], [ 3.164062, 19.890723 ], [ 2.373047, 20.055931 ], [ 2.197266, 20.303418 ], [ 1.757812, 20.303418 ], [ 1.582031, 20.632784 ], [ 1.142578, 20.797201 ], [ 1.142578, 21.125498 ], [ 0.791016, 21.371244 ], [ -4.746094, 25.005973 ], [ -8.701172, 27.293689 ], [ -8.701172, 28.767659 ], [ -7.646484, 29.458731 ], [ -6.855469, 29.458731 ], [ -5.800781, 29.688053 ], [ -5.800781, 29.535230 ], [ -5.625000, 29.535230 ], [ -5.361328, 29.916852 ], [ -4.833984, 30.297018 ], [ -4.658203, 30.297018 ], [ -4.306641, 30.600094 ], [ -3.691406, 30.751278 ], [ -3.603516, 30.977609 ], [ -3.867188, 31.203405 ], [ -3.867188, 31.353637 ], [ -3.691406, 31.428663 ], [ -3.603516, 31.728167 ], [ -2.900391, 31.802893 ], [ -2.988281, 32.101190 ], [ -1.230469, 32.101190 ], [ -1.318359, 32.398516 ], [ -1.054688, 32.546813 ], [ -1.494141, 32.768800 ], [ -1.494141, 33.063924 ], [ -1.757812, 33.284620 ], [ -1.669922, 34.089061 ], [ -1.845703, 34.379713 ], [ -1.757812, 34.524661 ], [ -1.933594, 34.597042 ], [ -1.845703, 34.813803 ], [ -2.285156, 35.101934 ], [ -1.933594, 35.101934 ], [ -1.406250, 35.317366 ], [ -1.054688, 35.746512 ], [ -0.615234, 35.746512 ], [ -0.527344, 35.960223 ], [ -0.087891, 35.817813 ], [ 0.263672, 36.244273 ], [ 0.791016, 36.385913 ], [ 0.878906, 36.527295 ], [ 2.285156, 36.668419 ], [ 2.548828, 36.597889 ], [ 2.900391, 36.879621 ], [ 3.603516, 36.809285 ], [ 3.691406, 36.949892 ], [ 4.746094, 36.949892 ], [ 5.009766, 36.879621 ], [ 5.009766, 36.738884 ], [ 5.449219, 36.668419 ], [ 5.625000, 36.879621 ], [ 6.240234, 36.949892 ], [ 6.328125, 37.160317 ], [ 6.767578, 36.949892 ] ] ] } } -] } -, { "type": "FeatureCollection", "properties": { "layer": "albania", "version": 2, "extent": 4096 }, "features": [ { "type": "Feature", "properties": { "scalerank": 0, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Albania", "sov_a3": "ALB", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Albania", "adm0_a3": "ALB", "geou_dif": 0, "geounit": "Albania", "gu_a3": "ALB", "su_dif": 0, "subunit": "Albania", "su_a3": "ALB", "brk_diff": 0, "name": "Albania", "name_long": "Albania", "brk_a3": "ALB", "brk_name": "Albania", "abbrev": "Alb.", "postal": "AL", "formal_en": "Republic of Albania", "name_sort": "Albania", "mapcolor7": 1, "mapcolor8": 4, "mapcolor9": 1, "mapcolor13": 6, "pop_est": 3639453, "gdp_md_est": 21810, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "AL", "iso_a3": "ALB", "iso_n3": "008", "un_a3": "008", "wb_a2": "AL", "wb_a3": "ALB", "woe_id": -99, "adm0_a3_is": "ALB", "adm0_a3_us": "ALB", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Southern Europe", "region_wb": "Europe & Central Asia", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 19.775391, 42.488302 ], [ 20.039062, 42.617791 ], [ 20.126953, 42.423457 ], [ 20.478516, 42.293564 ], [ 20.566406, 41.902277 ], [ 20.390625, 41.376809 ], [ 20.478516, 41.178654 ], [ 20.654297, 41.112469 ], [ 20.654297, 40.913513 ], [ 20.830078, 40.979898 ], [ 21.005859, 40.713956 ], [ 21.005859, 40.580585 ], [ 20.742188, 40.513799 ], [ 20.654297, 40.178873 ], [ 20.214844, 40.044438 ], [ 20.390625, 39.842286 ], [ 20.214844, 39.842286 ], [ 20.126953, 39.639538 ], [ 19.951172, 39.707187 ], [ 19.863281, 40.111689 ], [ 19.511719, 40.178873 ], [ 19.248047, 40.446947 ], [ 19.423828, 40.380028 ], [ 19.423828, 40.580585 ], [ 19.248047, 40.713956 ], [ 19.335938, 40.979898 ], [ 19.511719, 40.979898 ], [ 19.511719, 41.310824 ], [ 19.335938, 41.442726 ], [ 19.511719, 41.574361 ], [ 19.423828, 41.640078 ], [ 19.599609, 41.640078 ], [ 19.599609, 41.836828 ], [ 19.335938, 41.902277 ], [ 19.248047, 42.228517 ], [ 19.511719, 42.617791 ], [ 19.687500, 42.617791 ], [ 19.775391, 42.488302 ] ] ] } } ] } , +{ "type": "FeatureCollection", "properties": { "layer": "algeria", "version": 2, "extent": 4096 }, "features": [ +{ "type": "Feature", "properties": { "scalerank": 0, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Algeria", "sov_a3": "DZA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Algeria", "adm0_a3": "DZA", "geou_dif": 0, "geounit": "Algeria", "gu_a3": "DZA", "su_dif": 0, "subunit": "Algeria", "su_a3": "DZA", "brk_diff": 0, "name": "Algeria", "name_long": "Algeria", "brk_a3": "DZA", "brk_name": "Algeria", "abbrev": "Alg.", "postal": "DZ", "formal_en": "People's Democratic Republic of Algeria", "name_sort": "Algeria", "mapcolor7": 5, "mapcolor8": 1, "mapcolor9": 6, "mapcolor13": 3, "pop_est": 34178188, "gdp_md_est": 232900, "pop_year": -99, "lastcensus": 2008, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "DZ", "iso_a3": "DZA", "iso_n3": "012", "un_a3": "012", "wb_a2": "DZ", "wb_a3": "DZA", "woe_id": -99, "adm0_a3_is": "DZA", "adm0_a3_us": "DZA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Northern Africa", "region_wb": "Middle East & North Africa", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 6.767578, 36.949892 ], [ 7.119141, 36.949892 ], [ 7.207031, 37.090240 ], [ 7.734375, 37.020098 ], [ 7.734375, 36.879621 ], [ 7.998047, 36.879621 ], [ 8.173828, 37.020098 ], [ 8.525391, 36.949892 ], [ 8.613281, 36.879621 ], [ 8.349609, 36.809285 ], [ 8.437500, 36.738884 ], [ 8.085938, 36.527295 ], [ 8.349609, 36.456636 ], [ 8.173828, 35.960223 ], [ 8.349609, 35.317366 ], [ 8.173828, 34.957995 ], [ 8.261719, 34.813803 ], [ 8.173828, 34.597042 ], [ 7.470703, 34.161818 ], [ 7.470703, 33.724340 ], [ 7.646484, 33.284620 ], [ 8.085938, 33.137551 ], [ 8.261719, 32.546813 ], [ 9.052734, 32.026706 ], [ 9.492188, 30.297018 ], [ 9.228516, 30.145127 ], [ 9.492188, 29.840644 ], [ 9.843750, 28.998532 ], [ 9.755859, 28.226970 ], [ 9.931641, 27.839076 ], [ 9.667969, 27.371767 ], [ 9.843750, 26.588527 ], [ 9.404297, 26.431228 ], [ 9.316406, 26.115986 ], [ 10.019531, 25.324167 ], [ 10.019531, 24.846565 ], [ 10.195312, 24.766785 ], [ 10.195312, 24.607069 ], [ 11.513672, 24.367114 ], [ 11.953125, 23.563987 ], [ 7.734375, 21.125498 ], [ 5.888672, 19.559790 ], [ 3.251953, 18.979026 ], [ 3.076172, 19.145168 ], [ 3.076172, 19.311143 ], [ 3.251953, 19.394068 ], [ 3.164062, 19.890723 ], [ 2.373047, 20.055931 ], [ 2.197266, 20.303418 ], [ 1.757812, 20.303418 ], [ 1.582031, 20.632784 ], [ 1.142578, 20.797201 ], [ 1.142578, 21.125498 ], [ 0.791016, 21.371244 ], [ -4.746094, 25.005973 ], [ -8.701172, 27.293689 ], [ -8.701172, 28.767659 ], [ -7.646484, 29.458731 ], [ -6.855469, 29.458731 ], [ -5.800781, 29.688053 ], [ -5.800781, 29.535230 ], [ -5.625000, 29.535230 ], [ -5.361328, 29.916852 ], [ -4.833984, 30.297018 ], [ -4.658203, 30.297018 ], [ -4.306641, 30.600094 ], [ -3.691406, 30.751278 ], [ -3.603516, 30.977609 ], [ -3.867188, 31.203405 ], [ -3.867188, 31.353637 ], [ -3.691406, 31.428663 ], [ -3.603516, 31.728167 ], [ -2.900391, 31.802893 ], [ -2.988281, 32.101190 ], [ -1.230469, 32.101190 ], [ -1.318359, 32.398516 ], [ -1.054688, 32.546813 ], [ -1.494141, 32.768800 ], [ -1.494141, 33.063924 ], [ -1.757812, 33.284620 ], [ -1.669922, 34.089061 ], [ -1.845703, 34.379713 ], [ -1.757812, 34.524661 ], [ -1.933594, 34.597042 ], [ -1.845703, 34.813803 ], [ -2.285156, 35.101934 ], [ -1.933594, 35.101934 ], [ -1.406250, 35.317366 ], [ -1.054688, 35.746512 ], [ -0.615234, 35.746512 ], [ -0.527344, 35.960223 ], [ -0.087891, 35.817813 ], [ 0.263672, 36.244273 ], [ 0.791016, 36.385913 ], [ 0.878906, 36.527295 ], [ 2.285156, 36.668419 ], [ 2.548828, 36.597889 ], [ 2.900391, 36.879621 ], [ 3.603516, 36.809285 ], [ 3.691406, 36.949892 ], [ 4.746094, 36.949892 ], [ 5.009766, 36.879621 ], [ 5.009766, 36.738884 ], [ 5.449219, 36.668419 ], [ 5.625000, 36.879621 ], [ 6.240234, 36.949892 ], [ 6.328125, 37.160317 ], [ 6.767578, 36.949892 ] ] ] } } +] } +, { "type": "FeatureCollection", "properties": { "layer": "sweden", "version": 2, "extent": 4096 }, "features": [ { "type": "Feature", "properties": { "scalerank": 0, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Sweden", "sov_a3": "SWE", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Sweden", "adm0_a3": "SWE", "geou_dif": 0, "geounit": "Sweden", "gu_a3": "SWE", "su_dif": 0, "subunit": "Sweden", "su_a3": "SWE", "brk_diff": 0, "name": "Sweden", "name_long": "Sweden", "brk_a3": "SWE", "brk_name": "Sweden", "abbrev": "Swe.", "postal": "S", "formal_en": "Kingdom of Sweden", "name_sort": "Sweden", "mapcolor7": 1, "mapcolor8": 4, "mapcolor9": 2, "mapcolor13": 4, "pop_est": 9059651, "gdp_md_est": 344300, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "SE", "iso_a3": "SWE", "iso_n3": "752", "un_a3": "752", "wb_a2": "SE", "wb_a3": "SWE", "woe_id": -99, "adm0_a3_is": "SWE", "adm0_a3_us": "SWE", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Northern Europe", "region_wb": "Europe & Central Asia", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 22.236328, 65.585720 ], [ 22.324219, 65.549367 ], [ 22.324219, 65.512963 ], [ 22.148438, 65.512963 ], [ 22.148438, 65.585720 ], [ 22.236328, 65.585720 ] ] ], [ [ [ 16.523438, 56.316537 ], [ 16.347656, 56.218923 ], [ 16.347656, 56.607885 ], [ 16.699219, 56.897004 ], [ 16.875000, 57.326521 ], [ 17.050781, 57.373938 ], [ 16.523438, 56.316537 ] ] ], [ [ [ 18.720703, 57.751076 ], [ 18.720703, 57.468589 ], [ 18.896484, 57.421294 ], [ 18.632812, 57.373938 ], [ 18.632812, 57.231503 ], [ 18.369141, 57.183902 ], [ 18.281250, 56.944974 ], [ 18.105469, 56.944974 ], [ 18.281250, 57.088515 ], [ 18.017578, 57.279043 ], [ 18.105469, 57.610107 ], [ 18.632812, 57.938183 ], [ 18.720703, 57.844751 ], [ 18.808594, 57.938183 ], [ 18.984375, 57.938183 ], [ 18.984375, 57.984808 ], [ 19.160156, 58.031372 ], [ 19.335938, 57.984808 ], [ 18.984375, 57.891497 ], [ 19.072266, 57.844751 ], [ 18.720703, 57.751076 ] ] ], [ [ [ 11.513672, 57.938183 ], [ 11.425781, 58.077876 ], [ 11.689453, 58.077876 ], [ 11.513672, 57.938183 ] ] ], [ [ [ 18.457031, 59.040555 ], [ 18.281250, 59.040555 ], [ 18.281250, 59.130863 ], [ 18.457031, 59.130863 ], [ 18.457031, 59.040555 ] ] ], [ [ [ 18.720703, 59.534318 ], [ 18.544922, 59.534318 ], [ 18.632812, 59.623325 ], [ 18.720703, 59.623325 ], [ 18.720703, 59.534318 ] ] ], [ [ [ 19.072266, 59.800634 ], [ 18.896484, 59.800634 ], [ 18.896484, 59.888937 ], [ 18.984375, 59.844815 ], [ 18.984375, 59.888937 ], [ 19.072266, 59.888937 ], [ 19.072266, 59.800634 ] ] ], [ [ [ 18.457031, 60.413852 ], [ 18.281250, 60.413852 ], [ 18.281250, 60.500525 ], [ 18.457031, 60.500525 ], [ 18.457031, 60.413852 ] ] ], [ [ [ 20.917969, 63.665760 ], [ 20.742188, 63.665760 ], [ 20.742188, 63.743631 ], [ 20.917969, 63.743631 ], [ 20.917969, 63.665760 ] ] ], [ [ [ 18.632812, 59.355596 ], [ 18.457031, 59.355596 ], [ 18.369141, 59.445075 ], [ 18.632812, 59.355596 ] ] ], [ [ [ 18.193359, 59.445075 ], [ 18.281250, 59.445075 ], [ 18.281250, 59.400365 ], [ 18.193359, 59.445075 ] ] ], [ [ [ 18.193359, 59.445075 ], [ 18.105469, 59.445075 ], [ 18.193359, 59.489726 ], [ 18.193359, 59.445075 ] ] ], [ [ [ 17.402344, 61.773123 ], [ 17.490234, 61.648162 ], [ 17.314453, 61.731526 ], [ 17.402344, 61.773123 ] ] ], [ [ [ 23.027344, 65.730626 ], [ 23.027344, 65.694476 ], [ 22.851562, 65.694476 ], [ 22.851562, 65.766727 ], [ 22.939453, 65.766727 ], [ 23.027344, 65.730626 ] ] ], [ [ [ 20.302734, 63.743631 ], [ 20.302734, 63.665760 ], [ 20.214844, 63.704722 ], [ 20.214844, 63.665760 ], [ 20.039062, 63.704722 ], [ 19.687500, 63.548552 ], [ 19.687500, 63.470145 ], [ 19.423828, 63.587675 ], [ 19.335938, 63.548552 ], [ 19.511719, 63.509375 ], [ 19.511719, 63.430860 ], [ 19.335938, 63.509375 ], [ 18.984375, 63.194018 ], [ 18.896484, 63.233627 ], [ 18.632812, 63.233627 ], [ 18.632812, 63.114638 ], [ 18.544922, 63.154355 ], [ 18.457031, 63.035039 ], [ 18.193359, 63.035039 ], [ 18.544922, 62.995158 ], [ 18.369141, 62.995158 ], [ 18.457031, 62.875188 ], [ 18.193359, 62.915233 ], [ 18.193359, 62.794935 ], [ 17.929688, 62.794935 ], [ 18.105469, 62.835089 ], [ 17.841797, 62.835089 ], [ 17.841797, 62.674143 ], [ 18.017578, 62.593341 ], [ 17.841797, 62.633770 ], [ 17.841797, 62.512318 ], [ 17.578125, 62.512318 ], [ 17.666016, 62.471724 ], [ 17.490234, 62.471724 ], [ 17.402344, 62.552857 ], [ 17.314453, 62.512318 ], [ 17.314453, 62.349609 ], [ 17.578125, 62.267923 ], [ 17.314453, 62.021528 ], [ 17.314453, 61.731526 ], [ 17.226562, 61.731526 ], [ 17.050781, 61.648162 ], [ 17.050781, 61.396719 ], [ 17.226562, 61.312452 ], [ 17.050781, 61.312452 ], [ 17.226562, 61.058285 ], [ 17.138672, 60.930432 ], [ 17.314453, 60.802064 ], [ 17.138672, 60.716198 ], [ 17.314453, 60.630102 ], [ 17.578125, 60.673179 ], [ 17.666016, 60.500525 ], [ 17.929688, 60.630102 ], [ 18.105469, 60.413852 ], [ 18.544922, 60.283408 ], [ 18.281250, 60.326948 ], [ 18.369141, 60.196156 ], [ 18.544922, 60.196156 ], [ 18.544922, 60.108670 ], [ 18.720703, 60.152442 ], [ 18.720703, 60.020952 ], [ 18.808594, 60.108670 ], [ 18.984375, 59.888937 ], [ 18.896484, 59.888937 ], [ 18.720703, 59.800634 ], [ 19.072266, 59.756395 ], [ 18.632812, 59.712097 ], [ 18.720703, 59.667741 ], [ 18.632812, 59.623325 ], [ 18.544922, 59.623325 ], [ 18.544922, 59.534318 ], [ 18.369141, 59.489726 ], [ 18.017578, 59.489726 ], [ 18.017578, 59.400365 ], [ 17.929688, 59.445075 ], [ 18.017578, 59.355596 ], [ 18.105469, 59.355596 ], [ 18.105469, 59.445075 ], [ 18.281250, 59.400365 ], [ 18.281250, 59.355596 ], [ 18.193359, 59.355596 ], [ 18.369141, 59.175928 ], [ 18.281250, 59.130863 ], [ 18.017578, 59.040555 ], [ 17.841797, 58.904646 ], [ 17.753906, 58.950008 ], [ 17.753906, 58.995311 ], [ 17.666016, 58.995311 ], [ 17.666016, 58.950008 ], [ 17.753906, 58.904646 ], [ 17.578125, 58.904646 ], [ 17.578125, 58.859224 ], [ 17.402344, 58.904646 ], [ 17.314453, 58.768200 ], [ 16.962891, 58.768200 ], [ 17.138672, 58.722599 ], [ 16.962891, 58.722599 ], [ 16.875000, 58.631217 ], [ 16.171875, 58.676938 ], [ 16.787109, 58.631217 ], [ 16.699219, 58.585436 ], [ 16.875000, 58.493694 ], [ 16.347656, 58.493694 ], [ 16.699219, 58.447733 ], [ 16.611328, 58.309489 ], [ 16.787109, 58.355630 ], [ 16.787109, 58.170702 ], [ 16.611328, 58.217025 ], [ 16.699219, 57.891497 ], [ 16.435547, 58.031372 ], [ 16.611328, 57.797944 ], [ 16.523438, 57.844751 ], [ 16.699219, 57.704147 ], [ 16.523438, 57.751076 ], [ 16.611328, 57.657158 ], [ 16.435547, 57.657158 ], [ 16.611328, 57.562995 ], [ 16.611328, 57.421294 ], [ 16.435547, 57.326521 ], [ 16.523438, 57.088515 ], [ 16.347656, 57.040730 ], [ 16.435547, 56.800878 ], [ 16.347656, 56.656226 ], [ 16.171875, 56.656226 ], [ 15.820312, 56.121060 ], [ 15.644531, 56.218923 ], [ 14.941406, 56.218923 ], [ 14.677734, 56.170023 ], [ 14.677734, 56.022948 ], [ 14.414062, 56.072035 ], [ 14.150391, 55.875311 ], [ 14.326172, 55.578345 ], [ 14.150391, 55.429013 ], [ 12.919922, 55.429013 ], [ 12.832031, 55.578345 ], [ 13.007812, 55.627996 ], [ 13.007812, 55.776573 ], [ 12.832031, 55.776573 ], [ 12.919922, 55.875311 ], [ 12.744141, 55.924586 ], [ 12.392578, 56.316537 ], [ 12.832031, 56.267761 ], [ 12.568359, 56.462490 ], [ 12.832031, 56.462490 ], [ 12.919922, 56.559482 ], [ 12.304688, 56.944974 ], [ 12.041016, 57.231503 ], [ 12.041016, 57.468589 ], [ 11.865234, 57.373938 ], [ 11.865234, 57.704147 ], [ 11.689453, 57.704147 ], [ 11.777344, 57.797944 ], [ 11.601562, 57.844751 ], [ 11.689453, 58.077876 ], [ 11.777344, 58.124320 ], [ 11.337891, 58.124320 ], [ 11.601562, 58.309489 ], [ 11.425781, 58.263287 ], [ 11.601562, 58.401712 ], [ 11.513672, 58.447733 ], [ 11.425781, 58.355630 ], [ 11.337891, 58.447733 ], [ 11.162109, 58.355630 ], [ 11.250000, 58.676938 ], [ 11.074219, 58.950008 ], [ 11.162109, 59.130863 ], [ 11.337891, 59.130863 ], [ 11.425781, 58.904646 ], [ 11.601562, 58.904646 ], [ 11.689453, 58.995311 ], [ 11.777344, 59.400365 ], [ 11.601562, 59.623325 ], [ 11.865234, 59.712097 ], [ 11.777344, 59.888937 ], [ 12.128906, 59.933000 ], [ 12.480469, 60.108670 ], [ 12.568359, 60.413852 ], [ 12.216797, 61.015725 ], [ 12.656250, 61.058285 ], [ 12.832031, 61.227957 ], [ 12.832031, 61.396719 ], [ 12.128906, 61.731526 ], [ 12.304688, 62.267923 ], [ 12.041016, 62.593341 ], [ 12.041016, 62.955223 ], [ 12.216797, 63.035039 ], [ 11.953125, 63.312683 ], [ 12.216797, 63.509375 ], [ 12.128906, 63.626745 ], [ 12.919922, 64.091408 ], [ 13.886719, 64.014496 ], [ 14.150391, 64.206377 ], [ 14.062500, 64.472794 ], [ 13.623047, 64.586185 ], [ 14.501953, 65.330178 ], [ 14.501953, 66.160511 ], [ 15.029297, 66.160511 ], [ 15.468750, 66.302205 ], [ 15.380859, 66.513260 ], [ 16.083984, 66.964476 ], [ 16.347656, 67.033163 ], [ 16.435547, 67.204032 ], [ 16.083984, 67.441229 ], [ 16.435547, 67.575717 ], [ 16.699219, 67.908619 ], [ 17.226562, 68.106102 ], [ 17.841797, 67.974634 ], [ 17.929688, 68.007571 ], [ 18.105469, 68.171555 ], [ 18.105469, 68.560384 ], [ 18.457031, 68.592487 ], [ 18.632812, 68.496040 ], [ 18.984375, 68.528235 ], [ 19.951172, 68.366801 ], [ 20.214844, 68.496040 ], [ 19.951172, 68.560384 ], [ 20.302734, 68.784144 ], [ 20.302734, 68.911005 ], [ 20.039062, 69.037142 ], [ 20.742188, 69.037142 ], [ 20.917969, 68.974164 ], [ 20.830078, 68.911005 ], [ 21.181641, 68.847665 ], [ 21.445312, 68.688521 ], [ 21.708984, 68.592487 ], [ 21.884766, 68.592487 ], [ 21.972656, 68.496040 ], [ 22.500000, 68.463800 ], [ 23.027344, 68.301905 ], [ 23.115234, 68.138852 ], [ 23.291016, 68.171555 ], [ 23.291016, 68.073305 ], [ 23.642578, 67.974634 ], [ 23.466797, 67.908619 ], [ 23.378906, 67.474922 ], [ 23.730469, 67.441229 ], [ 23.554688, 67.135829 ], [ 23.994141, 66.826520 ], [ 23.818359, 66.757250 ], [ 23.818359, 66.583217 ], [ 23.554688, 66.443107 ], [ 23.642578, 66.231457 ], [ 23.994141, 66.089364 ], [ 24.082031, 65.802776 ], [ 23.994141, 65.838776 ], [ 23.906250, 65.766727 ], [ 23.730469, 65.838776 ], [ 23.378906, 65.838776 ], [ 23.378906, 65.766727 ], [ 23.291016, 65.838776 ], [ 23.115234, 65.838776 ], [ 23.203125, 65.766727 ], [ 23.027344, 65.730626 ], [ 23.027344, 65.766727 ], [ 22.939453, 65.766727 ], [ 22.763672, 65.874725 ], [ 22.587891, 65.910623 ], [ 22.675781, 65.766727 ], [ 22.324219, 65.874725 ], [ 22.324219, 65.766727 ], [ 22.148438, 65.766727 ], [ 22.236328, 65.730626 ], [ 22.148438, 65.658275 ], [ 22.236328, 65.622023 ], [ 22.324219, 65.658275 ], [ 22.412109, 65.549367 ], [ 22.324219, 65.549367 ], [ 22.324219, 65.585720 ], [ 22.236328, 65.585720 ], [ 21.708984, 65.730626 ], [ 22.148438, 65.549367 ], [ 21.796875, 65.549367 ], [ 21.972656, 65.512963 ], [ 21.884766, 65.403445 ], [ 21.445312, 65.403445 ], [ 21.621094, 65.256706 ], [ 21.269531, 65.403445 ], [ 21.181641, 65.366837 ], [ 21.533203, 65.256706 ], [ 21.533203, 65.072130 ], [ 21.357422, 65.035060 ], [ 21.357422, 64.960766 ], [ 21.181641, 64.960766 ], [ 21.093750, 64.848937 ], [ 21.005859, 64.886265 ], [ 21.005859, 64.811557 ], [ 21.269531, 64.811557 ], [ 21.269531, 64.699105 ], [ 21.093750, 64.699105 ], [ 21.269531, 64.586185 ], [ 21.445312, 64.623877 ], [ 21.533203, 64.548440 ], [ 21.445312, 64.548440 ], [ 21.533203, 64.434892 ], [ 21.357422, 64.358931 ], [ 21.269531, 64.396938 ], [ 21.269531, 64.320872 ], [ 21.005859, 64.244595 ], [ 20.654297, 63.821288 ], [ 20.566406, 63.860036 ], [ 20.390625, 63.704722 ], [ 20.302734, 63.743631 ] ], [ [ 17.841797, 62.995158 ], [ 17.666016, 63.035039 ], [ 17.841797, 62.955223 ], [ 17.841797, 62.995158 ] ], [ [ 18.896484, 63.273182 ], [ 18.720703, 63.273182 ], [ 18.896484, 63.233627 ], [ 18.896484, 63.273182 ] ], [ [ 11.865234, 58.355630 ], [ 11.601562, 58.309489 ], [ 11.777344, 58.263287 ], [ 11.865234, 58.355630 ] ], [ [ 17.666016, 58.995311 ], [ 17.753906, 59.130863 ], [ 17.578125, 59.085739 ], [ 17.578125, 58.995311 ], [ 17.666016, 58.995311 ] ] ] ] } } ] } diff --git a/tile.cpp b/tile.cpp index edb49dc..8981a92 100644 --- a/tile.cpp +++ b/tile.cpp @@ -608,10 +608,7 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s long long unclipped_features = 0; std::vector partials; - std::vector> features; - for (int i = 0; i < nlayers; i++) { - features.push_back(std::vector()); - } + std::map> features; int within[child_shards]; long long geompos[child_shards]; @@ -901,7 +898,6 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s for (size_t i = 0; i < partials.size(); i++) { std::vector &pgeoms = partials[i].geoms; - long long layer = partials[i].layer; signed char t = partials[i].t; long long original_seq = partials[i].original_seq; @@ -929,7 +925,13 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s // printf("segment %d layer %lld is %s\n", partials[i].segment, partials[i].layer, (*layer_unmaps)[partials[i].segment][partials[i].layer].c_str()); - features[layer].push_back(c); + std::string layername = (*layer_unmaps)[partials[i].segment][partials[i].layer]; + if (features.count(layername) == 0) { + features.insert(std::pair>(layername, std::vector())); + } + + auto f = features.find(layername); + f->second.push_back(c); } } } @@ -944,97 +946,100 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s } } - for (j = 0; j < nlayers; j++) { + for (auto fj = features.begin(); fj != features.end(); ++fj) { + std::vector &ff = fj->second; + if (additional[A_REORDER]) { - std::sort(features[j].begin(), features[j].end()); + std::sort(ff.begin(), ff.end()); } std::vector out; - if (features[j].size() > 0) { - out.push_back(features[j][0]); + if (ff.size() > 0) { + out.push_back(ff[0]); } - for (size_t x = 1; x < features[j].size(); x++) { + for (size_t x = 1; x < ff.size(); x++) { size_t y = out.size() - 1; #if 0 - if (out.size() > 0 && coalcmp(&features[j][x], &out[y]) < 0) { + if (out.size() > 0 && coalcmp(&ff[x], &out[y]) < 0) { fprintf(stderr, "\nfeature out of order\n"); } #endif - if (additional[A_COALESCE] && out.size() > 0 && out[y].geom.size() + features[j][x].geom.size() < 700 && coalcmp(&features[j][x], &out[y]) == 0 && features[j][x].type != VT_POINT) { - for (size_t g = 0; g < features[j][x].geom.size(); g++) { - out[y].geom.push_back(features[j][x].geom[g]); + if (additional[A_COALESCE] && out.size() > 0 && out[y].geom.size() + ff[x].geom.size() < 700 && coalcmp(&ff[x], &out[y]) == 0 && ff[x].type != VT_POINT) { + for (size_t g = 0; g < ff[x].geom.size(); g++) { + out[y].geom.push_back(ff[x].geom[g]); } out[y].coalesced = true; } else { - out.push_back(features[j][x]); + out.push_back(ff[x]); } } - features[j] = out; + ff = out; out.clear(); - for (size_t x = 0; x < features[j].size(); x++) { - if (features[j][x].coalesced && features[j][x].type == VT_LINE) { - features[j][x].geom = remove_noop(features[j][x].geom, features[j][x].type, 0); - features[j][x].geom = simplify_lines(features[j][x].geom, 32, 0, - !(prevent[P_CLIPPING] || prevent[P_DUPLICATION]), simplification); + for (size_t x = 0; x < ff.size(); x++) { + if (ff[x].coalesced && ff[x].type == VT_LINE) { + ff[x].geom = remove_noop(ff[x].geom, ff[x].type, 0); + ff[x].geom = simplify_lines(ff[x].geom, 32, 0, + !(prevent[P_CLIPPING] || prevent[P_DUPLICATION]), simplification); } - if (features[j][x].type == VT_POLYGON) { - if (features[j][x].coalesced) { - features[j][x].geom = clean_or_clip_poly(features[j][x].geom, 0, 0, 0, false); + if (ff[x].type == VT_POLYGON) { + if (ff[x].coalesced) { + ff[x].geom = clean_or_clip_poly(ff[x].geom, 0, 0, 0, false); } - features[j][x].geom = close_poly(features[j][x].geom); + ff[x].geom = close_poly(ff[x].geom); } - if (features[j][x].geom.size() > 0) { - out.push_back(features[j][x]); + if (ff[x].geom.size() > 0) { + out.push_back(ff[x]); } } - features[j] = out; + ff = out; if (prevent[P_INPUT_ORDER]) { - std::sort(features[j].begin(), features[j].end(), preservecmp); + std::sort(ff.begin(), ff.end(), preservecmp); } } mvt_tile tile; - for (size_t k = 0; k < features.size(); k++) { - mvt_layer layer; + for (auto fj = features.begin(); fj != features.end(); ++fj) { + std::vector &ff = fj->second; - layer.name = (*layernames)[k]; + mvt_layer layer; + layer.name = fj->first; layer.version = 2; layer.extent = 1 << line_detail; - for (size_t x = 0; x < features[k].size(); x++) { + for (size_t x = 0; x < ff.size(); x++) { mvt_feature feature; - if (features[k][x].type == VT_LINE || features[k][x].type == VT_POLYGON) { - features[k][x].geom = remove_noop(features[k][x].geom, features[k][x].type, 0); + if (ff[x].type == VT_LINE || ff[x].type == VT_POLYGON) { + ff[x].geom = remove_noop(ff[x].geom, ff[x].type, 0); } - if (features[k][x].geom.size() == 0) { + if (ff[x].geom.size() == 0) { continue; } - feature.type = features[k][x].type; - feature.geometry = to_feature(features[k][x].geom); - count += features[k][x].geom.size(); - features[k][x].geom.clear(); + feature.type = ff[x].type; + feature.geometry = to_feature(ff[x].geom); + count += ff[x].geom.size(); + ff[x].geom.clear(); - feature.id = features[k][x].id; - feature.has_id = features[k][x].has_id; + feature.id = ff[x].id; + feature.has_id = ff[x].has_id; - decode_meta(features[k][x].m, features[k][x].keys, features[k][x].values, features[k][x].stringpool, layer, feature); + decode_meta(ff[x].m, ff[x].keys, ff[x].values, ff[x].stringpool, layer, feature); if (additional[A_CALCULATE_FEATURE_DENSITY]) { int glow = 255; - if (features[k][x].spacing > 0) { - glow = (1 / features[k][x].spacing); + if (ff[x].spacing > 0) { + glow = (1 / ff[x].spacing); if (glow > 255) { glow = 255; } @@ -1059,8 +1064,9 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s } long long totalsize = 0; - for (j = 0; j < nlayers; j++) { - totalsize += features[j].size(); + for (auto fj = features.begin(); fj != features.end(); ++fj) { + std::vector &ff = fj->second; + totalsize += ff.size(); } double progress = floor((((*geompos_in + *along - alongminus) / (double) todo) + z) / (maxzoom + 1) * 1000) / 10;