@@ -119,154 +119,34 @@ export async function Response($request, $response, KV) {
119119 const targetCountryCode = url . searchParams . get ( "country_code" ) ;
120120 let source ;
121121 const target = body ;
122- let tileStyles ;
122+ let sourceCountryCode ;
123123 switch ( targetCountryCode ) {
124124 case "CN" : {
125125 const xxURL = new URL ( url . toString ( ) ) ;
126126 xxURL . searchParams . set ( "country_code" , "US" ) ;
127+ sourceCountryCode = "XX" ;
127128 source = await GEOResourceManifest . decodeCache ( Caches , xxURL . search , KV ) ;
128129 const isReady = Boolean ( source ) ;
129130 if ( ! isReady ) {
130131 Console . warn ( "Missing cache: XX" ) ;
131132 }
132133 if ( ! isReady ) break geoManifestPath;
133- tileStyles = [
134- "RASTER_STANDARD" ,
135- "VECTOR_LEGACY_REALISTIC" ,
136- "SPUTNIK_VECTOR_BORDER" ,
137- "VECTOR_TRANSIT" ,
138- "VECTOR_TRANSIT_SELECTION" ,
139- "VECTOR_COVERAGE" ,
140- "VECTOR_ROAD_NETWORK" ,
141- "VECTOR_DEBUG" ,
142- "MUNIN_METADATA" ,
143- "VECTOR_TRACKS" ,
144- "VECTOR_RESERVED_2" ,
145- "COARSE_LOCATION_POLYGONS" ,
146- "VECTOR_SPR_ROADS" ,
147- "VECTOR_SPR_STANDARD" ,
148- "VL_METADATA" ,
149- "VL_DATA" ,
150- "PROACTIVE_APP_CLIP" ,
151- "POI_BUSYNESS" ,
152- "POI_DP_BUSYNESS" ,
153- "SMART_INTERFACE_SELECTION" ,
154- "VECTOR_ASSETS" ,
155- "VECTOR_SPR_POLAR" ,
156- "SMART_DATA_MODE" ,
157- "CELLULAR_PERFORMANCE_SCORE" ,
158- "VECTOR_LIVE_DATA_UPDATES" ,
159- "VECTOR_ROAD_SELECTION" ,
160- "VECTOR_REGION_METADATA" ,
161- "RAY_TRACING" ,
162- "RASTER_SATELLITE_POLAR" ,
163- "VMAP4_ELEVATION" ,
164- "VMAP4_ELEVATION_POLAR" ,
165- "CELLULAR_COVERAGE_PLMN" ,
166- "RASTER_SATELLITE_POLAR_NIGHT" ,
167- "BLUEPOI_MODEL" ,
168- "BLUEPOI_AOI" ,
169- "FLYOVER_V2_R3D" ,
170- "FLYOVER_V2_DSM" ,
171- "FLYOVER_V2_METADATA" ,
172- "VECTOR_DCT" ,
173- "SECA" ,
174- "UNUSED_103" ,
175- "UNUSED_104" ,
176- "UNUSED_105" ,
177- "UNUSED_106" ,
178- "UNUSED_107" ,
179- "UNUSED_108" ,
180- "UNUSED_109" ,
181- "UNUSED_110" ,
182- "UNUSED_111" ,
183- "UNUSED_112" ,
184- "UNUSED_113" ,
185- "UNUSED_114" ,
186- "UNUSED_115" ,
187- "UNUSED_116" ,
188- "UNUSED_117" ,
189- "UNUSED_118" ,
190- "UNUSED_119" ,
191- "UNUSED_120" ,
192- ] ;
193134 break ;
194135 }
195136 default : {
196137 const cnURL = new URL ( url . toString ( ) ) ;
197138 cnURL . searchParams . set ( "country_code" , "CN" ) ;
139+ sourceCountryCode = "CN" ;
198140 source = await GEOResourceManifest . decodeCache ( Caches , cnURL . search , KV ) ;
199141 const isReady = Boolean ( source ) ;
200142 if ( ! isReady ) {
201143 Console . warn ( "Missing cache: CN" ) ;
202144 }
203145 if ( ! isReady ) break geoManifestPath;
204- tileStyles = [
205- "VECTOR_STANDARD" ,
206- "VECTOR_TRAFFIC_SEGMENTS_FOR_RASTER" ,
207- "VECTOR_TRAFFIC_INCIDENTS_FOR_RASTER" ,
208- "VECTOR_TRAFFIC_SEGMENTS_AND_INCIDENTS_FOR_RASTER" ,
209- "RASTER_STANDARD_BACKGROUND" ,
210- "RASTER_HYBRID" ,
211- "RASTER_SATELLITE" ,
212- "RASTER_TERRAIN" ,
213- "VECTOR_BUILDINGS" ,
214- "VECTOR_TRAFFIC" ,
215- "VECTOR_POI" ,
216- "SPUTNIK_METADATA" ,
217- "SPUTNIK_C3M" ,
218- "SPUTNIK_DSM" ,
219- "SPUTNIK_DSM_GLOBAL" ,
220- "VECTOR_REALISTIC" ,
221- "VECTOR_ROADS" ,
222- "RASTER_VEGETATION" ,
223- "VECTOR_TRAFFIC_SKELETON" ,
224- "RASTER_COASTLINE_MASK" ,
225- "RASTER_HILLSHADE" ,
226- "VECTOR_TRAFFIC_WITH_GREEN" ,
227- "VECTOR_TRAFFIC_STATIC" ,
228- "RASTER_COASTLINE_DROP_MASK" ,
229- "VECTOR_TRAFFIC_SKELETON_WITH_HISTORICAL" ,
230- "VECTOR_SPEED_PROFILES" ,
231- "VECTOR_VENUES" ,
232- "RASTER_DOWN_SAMPLED" ,
233- "RASTER_COLOR_BALANCED" ,
234- "RASTER_SATELLITE_NIGHT" ,
235- "RASTER_SATELLITE_DIGITIZE" ,
236- "RASTER_HILLSHADE_PARKS" ,
237- "RASTER_STANDARD_BASE" ,
238- "RASTER_STANDARD_LABELS" ,
239- "RASTER_HYBRID_ROADS" ,
240- "RASTER_HYBRID_LABELS" ,
241- "FLYOVER_C3M_MESH" ,
242- "FLYOVER_C3M_JPEG_TEXTURE" ,
243- "FLYOVER_C3M_ASTC_TEXTURE" ,
244- "RASTER_SATELLITE_ASTC" ,
245- "RASTER_HYBRID_ROADS_AND_LABELS" ,
246- "FLYOVER_VISIBILITY" ,
247- "FLYOVER_SKYBOX" ,
248- "FLYOVER_NAVGRAPH" ,
249- "FLYOVER_METADATA" ,
250- "VECTOR_LAND_COVER" ,
251- "VECTOR_STREET_POI" ,
252- "VECTOR_SPR_MERCATOR" ,
253- "VECTOR_SPR_MODELS" ,
254- "VECTOR_SPR_MATERIALS" ,
255- "VECTOR_SPR_METADATA" ,
256- "VECTOR_STREET_LANDMARKS" ,
257- "VECTOR_POI_V2" ,
258- "VECTOR_POLYGON_SELECTION" ,
259- "VECTOR_BUILDINGS_V2" ,
260- "SPR_ASSET_METADATA" ,
261- "VECTOR_SPR_MODELS_OCCLUSION" ,
262- "VECTOR_TOPOGRAPHIC" ,
263- "VECTOR_POI_V2_UPDATE" ,
264- "VECTOR_TRAFFIC_V2" ,
265- "VECTOR_CONTOURS" ,
266- ] ;
267146 break ;
268147 }
269148 }
149+ const tileStyles = GEOResourceManifest . tileStyles ( Configs , Settings , sourceCountryCode ) ;
270150 target . tileSet = GEOResourceManifest . tileSets ( source . tileSet , target . tileSet , tileStyles ) ;
271151 target . attribution = GEOResourceManifest . attributions ( source . attribution , target . attribution , targetCountryCode ) ;
272152 target . resource = GEOResourceManifest . resources ( source . resource , target . resource , targetCountryCode ) ;
@@ -275,7 +155,7 @@ export async function Response($request, $response, KV) {
275155 target . muninBucket = GEOResourceManifest . muninBuckets ( source . muninBucket , target . muninBucket , Settings , targetCountryCode ) ;
276156 target . displayString = GEOResourceManifest . displayStrings ( source . displayString , target . displayString , targetCountryCode ) ;
277157 target . tileGroup = GEOResourceManifest . tileGroups ( target . tileGroup , target . tileSet , target . attribution , target . resource ) ;
278- Console . debug ( `releaseInfo: ${ target . releaseInfo } ` ) ;
158+ Console . debug ( `releaseInfo: ${ body . releaseInfo } ` ) ;
279159 rawBody = GEOResourceManifestDownload . encode ( target ) ;
280160 break ;
281161 }
0 commit comments