mirror of
https://github.com/felt/tippecanoe.git
synced 2026-11-22 16:31:18 +01:00
Compare commits
46
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
63259a8757 | ||
|
|
bb4f220678 | ||
|
|
266ef3c286 | ||
|
|
1519b50791 | ||
|
|
bd48ba8ea1 | ||
|
|
e796400377 | ||
|
|
655eccfcc3 | ||
|
|
021bb96aeb | ||
|
|
6a8f1b83d8 | ||
|
|
312e1560a3 | ||
|
|
d9a5c2eed7 | ||
|
|
853ada87b5 | ||
|
|
a987197eed | ||
|
|
2b6630c42c | ||
|
|
96f126dd59 | ||
|
|
4e52cbd957 | ||
|
|
e2a7a409c7 | ||
|
|
c5c4698161 | ||
|
|
6a2bce8164 | ||
|
|
ca1aa58a11 | ||
|
|
7d4d264d50 | ||
|
|
cbf222754b | ||
|
|
f957f30f90 | ||
|
|
679a0d62f2 | ||
|
|
5d92a17193 | ||
|
|
e8ca6c6de3 | ||
|
|
02e3bac2c0 | ||
|
|
15a3e313ff | ||
|
|
d7bdbe363b | ||
|
|
d359461e61 | ||
|
|
2c56187530 | ||
|
|
e1c665b35d | ||
|
|
0ca14086a9 | ||
|
|
cc5c1c79df | ||
|
|
26bf08deb2 | ||
|
|
dcc3a11915 | ||
|
|
f7dc7faf31 | ||
|
|
390771f855 | ||
|
|
dee40802fd | ||
|
|
e6d05bc317 | ||
|
|
2ec6180003 | ||
|
|
6778aeac52 | ||
|
|
39ad95ed73 | ||
|
|
2b133a1def | ||
|
|
f00eeb486a | ||
|
|
9e9e21bcc0 |
+1
-1
@@ -1 +1 @@
|
||||
* @e-n-f @joeherm @migurski @arredond @dnomadb @ChrisLoer @cduruk @ibesora
|
||||
* @e-n-f @joeherm @migurski @arredond @dnomadb @ChrisLoer @ibesora
|
||||
|
||||
@@ -5,7 +5,10 @@ on: [push]
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
version: ['Release', 'Debug']
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- run: make
|
||||
- run: make test
|
||||
- run: uname -a; BUILDTYPE=${{ matrix.version }} make
|
||||
- run: make test
|
||||
@@ -35,6 +35,7 @@ tile-join
|
||||
tippecanoe-decode
|
||||
tippecanoe-enumerate
|
||||
tippecanoe-json-tool
|
||||
tippecanoe-overzoom
|
||||
unit
|
||||
|
||||
# Tests
|
||||
|
||||
+139
@@ -1,3 +1,142 @@
|
||||
# 2.53.0
|
||||
|
||||
* Stop trying to add features to the tile after the feature limit is reached
|
||||
|
||||
# 2.52.0
|
||||
|
||||
* Fix accidental loss (at all zooms) of features that specify an explicit minzoom
|
||||
|
||||
# 2.51.0
|
||||
|
||||
* Fix null behavior in "in" expressions
|
||||
* But they are back to not using unidecode
|
||||
|
||||
# 2.50.0
|
||||
|
||||
* FSL-style "in" expressions use unidecode again
|
||||
|
||||
# 2.49.0
|
||||
|
||||
* FSL-style "in" expressions now allow numeric comparisons, but they no longer use unidecode to remove diacritics.
|
||||
|
||||
# 2.48.0
|
||||
|
||||
* Fix some undefined behavior bugs, one of which results in slight changes to line simplification choices
|
||||
|
||||
# 2.47.0
|
||||
|
||||
* Stabilize feature order in tippecanoe-overzoom when --preserve-feature-order is specified but the sequence attribute is not present
|
||||
|
||||
# 2.46.0
|
||||
|
||||
* Polygon dust returns to having the attributes of the contributing feature nearest the placeholder instead of the contributing feature with the largest area.
|
||||
|
||||
# 2.45.0
|
||||
|
||||
* Adjust tile size limit with --retain-points-multiplier dynamically within each tile, to allow multiplier features at high zooms if other features are being dropped as-needed
|
||||
|
||||
# 2.44.0
|
||||
|
||||
* Add --unidecode-data option to allow case-insensitive filter comparisons of transliterated strings
|
||||
|
||||
# 2.43.0
|
||||
|
||||
* Change -fraction-as-needed feature dropping to be consistent across tiles and zoom levels, and to follow the same pattern as point dropping by zoom level
|
||||
* With -as-needed feature dropping, drop or retain entire multiplier clusters instead of individual features
|
||||
* Sort the features within each multiplier cluster by its retention priority, for more consistency between zoom levels in filtered feature choice
|
||||
|
||||
# 2.42.0
|
||||
|
||||
* Improve tiling speed
|
||||
* Generate tilestats for the --retain-points-multiplier attributes
|
||||
|
||||
# 2.41.3
|
||||
|
||||
* Performance optimizations to tile reading, writing, and overzooming
|
||||
* Automatically vary the tile size limit by zoom level to match the intended retain-points-multiplier multiplication
|
||||
* Fix decompression error when bailing out because a tile can't be made small enough
|
||||
* Search harder for a feature size threshold to make the tile small enough before giving up
|
||||
|
||||
# 2.41.2
|
||||
|
||||
* Add --accumulate-attribute to tippecanoe-overzoom
|
||||
* Go back to ordering features within each multiplier cluster spatially, not in the order specified for tile feature order
|
||||
|
||||
# 2.41.1
|
||||
|
||||
* Make --preserve-input-order, --order-by, --order-descending-by, --order-smallest-first, and --order-largest-first cooperate with --retain-points-multiplier. The clusters will be ordered by their lead feature in the specified sequence. The other features in each cluster will continue to be physically near the lead feature, but ordered as specified within the cluster.
|
||||
|
||||
# 2.41.0
|
||||
|
||||
* Add Felt-style expression support for -j feature filters
|
||||
* Add --retain-points-multiplier option
|
||||
* Add tippecanoe_decisions metadata field to record basezoom, drop rate, and multiplier
|
||||
* Add multiplier thinning (-m) and feature filters (-j) to tippecanoe-overzoom
|
||||
|
||||
# 2.40.0
|
||||
|
||||
* Slightly reduce compression aggressiveness to improve as-needed dropping speed
|
||||
|
||||
# 2.39.0
|
||||
|
||||
* Reduce memory usage during tiling
|
||||
|
||||
# 2.38.0
|
||||
|
||||
* Tolerate polygon rings with insuffiently many points in input
|
||||
|
||||
# 2.37.1
|
||||
|
||||
* Reduce maximum memory used for vertex sorting
|
||||
|
||||
# 2.37.0
|
||||
|
||||
* Speed up tile-join overzooming and make it use less memory, by not including empty child tiles in the enumeration
|
||||
|
||||
# 2.36.0
|
||||
|
||||
* Make tile-join distrust the source tilesets' metadata maxzoom and minzoom
|
||||
* Add a special case in --detect-longitude-wraparound not to wrap around jumps of exactly 360°
|
||||
|
||||
# 2.35.0
|
||||
|
||||
* Fix a bug in --detect-longitude-wraparound when there are multiple rings
|
||||
|
||||
# 2.34.1
|
||||
|
||||
* Further improvements to tile-join speed
|
||||
|
||||
# 2.34.0
|
||||
|
||||
* Improve speed of overzooming in tile-join
|
||||
|
||||
# 2.33.0
|
||||
|
||||
* Further reduce memory usage of --no-simplification-of-shared-nodes by calculating the list of shared nodes globally using temporary files rather than in memory for each individual tile
|
||||
* Make --no-simplification-of-shared-nodes behave for LineStrings as it does for Polygons, preventing simplification only at crossings, convergences, and divergences, not at every point along collinear segments
|
||||
|
||||
# 2.32.1
|
||||
|
||||
* Reduce memory usage of --no-simplification-of-shared-nodes for polygons
|
||||
|
||||
# 2.32.0
|
||||
|
||||
* Extend --no-simplification-of-shared-nodes to also simplify shared polygon borders consistently
|
||||
|
||||
# 2.31.0
|
||||
|
||||
* Fix tile-join crash when trying to join empty tilesets
|
||||
* Add --no-tiny-polygon-reduction-at-maximum-zoom option
|
||||
|
||||
# 2.30.1
|
||||
|
||||
* Fix spurious reports of tiny polygons and 0-length LineStrings in "strategies"
|
||||
|
||||
# 2.30.0
|
||||
|
||||
* Add --extend-zooms-if-still-dropping-maximum option
|
||||
* Add --overzoom option to tile-join
|
||||
|
||||
# 2.29.0
|
||||
|
||||
* Add tippecanoe-overzoom tool
|
||||
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
FROM ubuntu:22.04 AS tippacanoe-builder
|
||||
FROM ubuntu:22.04 AS tippecanoe-builder
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get -y install build-essential libsqlite3-dev zlib1g-dev
|
||||
@@ -15,6 +15,6 @@ FROM ubuntu:22.04
|
||||
RUN apt-get update \
|
||||
&& apt-get -y install libsqlite3-dev zlib1g-dev \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
COPY --from=tippacanoe-builder /tmp/tippecanoe-src/tippecanoe* /usr/local/bin/
|
||||
COPY --from=tippacanoe-builder /tmp/tippecanoe-src/tile-join /usr/local/bin/
|
||||
COPY --from=tippecanoe-builder /tmp/tippecanoe-src/tippecanoe* /usr/local/bin/
|
||||
COPY --from=tippecanoe-builder /tmp/tippecanoe-src/tile-join /usr/local/bin/
|
||||
WORKDIR /app
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
FROM centos:7
|
||||
FROM centos:centos8
|
||||
|
||||
RUN yum install -y make sqlite-devel zlib-devel bash git gcc-c++
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ C = $(wildcard *.c) $(wildcard *.cpp)
|
||||
INCLUDES = -I/usr/local/include -I.
|
||||
LIBS = -L/usr/local/lib
|
||||
|
||||
tippecanoe: geojson.o jsonpull/jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o mvt.o serial.o main.o text.o dirtiles.o pmtiles_file.o plugin.o read_json.o write_json.o geobuf.o flatgeobuf.o evaluator.o geocsv.o csv.o geojson-loop.o json_logger.o visvalingam.o compression.o clip.o
|
||||
tippecanoe: geojson.o jsonpull/jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o mvt.o serial.o main.o text.o dirtiles.o pmtiles_file.o plugin.o read_json.o write_json.o geobuf.o flatgeobuf.o evaluator.o geocsv.o csv.o geojson-loop.o json_logger.o visvalingam.o compression.o clip.o sort.o attribute.o thread.o shared_borders.o
|
||||
$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 -lpthread
|
||||
|
||||
tippecanoe-enumerate: enumerate.o
|
||||
@@ -67,16 +67,16 @@ tippecanoe-enumerate: enumerate.o
|
||||
tippecanoe-decode: decode.o projection.o mvt.o write_json.o text.o jsonpull/jsonpull.o dirtiles.o pmtiles_file.o
|
||||
$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3
|
||||
|
||||
tile-join: tile-join.o projection.o mbtiles.o mvt.o memfile.o dirtiles.o jsonpull/jsonpull.o text.o evaluator.o csv.o write_json.o pmtiles_file.o
|
||||
tile-join: tile-join.o projection.o mbtiles.o mvt.o memfile.o dirtiles.o jsonpull/jsonpull.o text.o evaluator.o csv.o write_json.o pmtiles_file.o clip.o attribute.o thread.o
|
||||
$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 -lpthread
|
||||
|
||||
tippecanoe-json-tool: jsontool.o jsonpull/jsonpull.o csv.o text.o geojson-loop.o
|
||||
$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 -lpthread
|
||||
|
||||
unit: unit.o text.o
|
||||
unit: unit.o text.o sort.o mvt.o
|
||||
$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 -lpthread
|
||||
|
||||
tippecanoe-overzoom: overzoom.o mvt.o clip.o
|
||||
tippecanoe-overzoom: overzoom.o mvt.o clip.o evaluator.o jsonpull/jsonpull.o text.o attribute.o
|
||||
$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 -lpthread
|
||||
|
||||
-include $(wildcard *.d)
|
||||
@@ -91,7 +91,7 @@ clean:
|
||||
rm -f ./tippecanoe ./tippecanoe-* ./tile-join ./unit *.o *.d */*.o */*.d tests/**/*.mbtiles tests/**/*.check
|
||||
|
||||
indent:
|
||||
clang-format -i -style="{BasedOnStyle: Google, IndentWidth: 8, UseTab: Always, AllowShortIfStatementsOnASingleLine: false, ColumnLimit: 0, ContinuationIndentWidth: 8, SpaceAfterCStyleCast: true, IndentCaseLabels: false, AllowShortBlocksOnASingleLine: false, AllowShortFunctionsOnASingleLine: false, SortIncludes: false}" $(filter-out flatgeobuf.cpp,$(C)) $(H)
|
||||
clang-format -i -style="{BasedOnStyle: Google, IndentWidth: 8, UseTab: Always, AllowShortIfStatementsOnASingleLine: false, ColumnLimit: 0, ContinuationIndentWidth: 8, SpaceAfterCStyleCast: true, IndentCaseLabels: false, AllowShortBlocksOnASingleLine: false, AllowShortFunctionsOnASingleLine: false, SortIncludes: false}" $(filter-out flatgeobuf.cpp,$(C)) $(H) jsonpull/*.[ch]
|
||||
|
||||
TESTS = $(wildcard tests/*/out/*.json)
|
||||
SPACE = $(NULL) $(NULL)
|
||||
@@ -107,6 +107,7 @@ suffixes = json json.gz
|
||||
# %22 for quoted quote
|
||||
# %2f for /
|
||||
# %3a for :
|
||||
# %5f for _
|
||||
# %7b for {
|
||||
|
||||
testargs = \
|
||||
@@ -115,7 +116,8 @@ testargs = \
|
||||
$(subst %3a,:,\
|
||||
$(subst %2f,/,\
|
||||
$(subst %7b,'{',\
|
||||
$(subst _, ,$(1)))))))
|
||||
$(subst %5f,'_',\
|
||||
$(subst _, ,$(1))))))))
|
||||
|
||||
%.json.check:
|
||||
./tippecanoe -q -a@ -f -o $@.mbtiles $(call testargs,$(patsubst %.json.check,%,$(word 4,$(subst /, ,$@)))) $(foreach suffix,$(suffixes),$(sort $(wildcard $(subst $(SPACE),/,$(wordlist 1,2,$(subst /, ,$@)))/*.$(suffix)))) < /dev/null
|
||||
@@ -167,7 +169,7 @@ parallel-test: $(eval SHELL:=$(ADVSHELL))
|
||||
cmp tests/parallel/linear-file.json tests/parallel/parallel-pipes.json
|
||||
rm tests/parallel/*.mbtiles tests/parallel/*.json
|
||||
|
||||
raw-tiles-test:
|
||||
raw-tiles-test: tippecanoe tippecanoe-decode tile-join
|
||||
./tippecanoe -q -f -e tests/raw-tiles/raw-tiles -r1 -pC tests/raw-tiles/hackspots.geojson
|
||||
./tippecanoe-decode -x generator tests/raw-tiles/raw-tiles > tests/raw-tiles/raw-tiles.json.check
|
||||
cmp tests/raw-tiles/raw-tiles.json.check tests/raw-tiles/raw-tiles.json
|
||||
@@ -185,7 +187,7 @@ raw-tiles-test:
|
||||
cmp tests/raw-tiles/nothing.json.check tests/raw-tiles/nothing.json
|
||||
rm -r tests/raw-tiles/nothing tests/raw-tiles/nothing.json.check
|
||||
|
||||
pmtiles-test:
|
||||
pmtiles-test: tippecanoe tippecanoe-decode tile-join
|
||||
./tippecanoe -q -f -o tests/pmtiles/hackspots.pmtiles -r1 -pC tests/raw-tiles/hackspots.geojson
|
||||
./tippecanoe-decode -x generator tests/pmtiles/hackspots.pmtiles > tests/pmtiles/hackspots.json.check
|
||||
cmp tests/pmtiles/hackspots.json.check tests/pmtiles/hackspots.json
|
||||
@@ -222,7 +224,7 @@ pmtiles-test:
|
||||
cmp tests/raw-tiles/nothing.json.check tests/raw-tiles/nothing.json
|
||||
rm -r tests/raw-tiles/nothing.pmtiles tests/raw-tiles/nothing.json.check
|
||||
|
||||
decode-test:
|
||||
decode-test: tippecanoe tippecanoe-decode
|
||||
mkdir -p tests/muni/decode
|
||||
./tippecanoe -q -z11 -Z11 -f -o tests/muni/decode/multi.mbtiles tests/muni/*.json
|
||||
./tippecanoe-decode -x generator -l subway tests/muni/decode/multi.mbtiles > tests/muni/decode/multi.mbtiles.json.check
|
||||
@@ -239,7 +241,7 @@ decode-test:
|
||||
cmp tests/muni/decode/multi.mbtiles.stats.json.check tests/muni/decode/multi.mbtiles.stats.json
|
||||
rm -f tests/muni/decode/multi.mbtiles.json.check tests/muni/decode/multi.mbtiles tests/muni/decode/multi.mbtiles.pipeline.json.check tests/muni/decode/multi.mbtiles.stats.json.check tests/muni/decode/multi.mbtiles.onetile.json.check
|
||||
|
||||
decode-pmtiles-test:
|
||||
decode-pmtiles-test: tippecanoe tippecanoe-decode
|
||||
mkdir -p tests/muni/decode
|
||||
./tippecanoe -q -z11 -Z11 -f -o tests/muni/decode/multi.pmtiles tests/muni/*.json
|
||||
./tippecanoe-decode -x generator -l subway tests/muni/decode/multi.pmtiles | sed 's/pmtiles/mbtiles/g' > tests/muni/decode/multi.pmtiles.json.check
|
||||
@@ -256,7 +258,7 @@ decode-pmtiles-test:
|
||||
cmp tests/muni/decode/multi.pmtiles.stats.json.check tests/muni/decode/multi.mbtiles.stats.json
|
||||
rm -f tests/muni/decode/multi.pmtiles.json.check tests/muni/decode/multi.pmtiles tests/muni/decode/multi.pmtiles.pipeline.json.check tests/muni/decode/multi.pmtiles.stats.json.check tests/muni/decode/multi.pmtiles.onetile.json.check
|
||||
|
||||
pbf-test:
|
||||
pbf-test: tippecanoe-decode
|
||||
./tippecanoe-decode -x generator tests/pbf/11-328-791.vector.pbf 11 328 791 > tests/pbf/11-328-791.vector.pbf.out
|
||||
cmp tests/pbf/11-328-791.json tests/pbf/11-328-791.vector.pbf.out
|
||||
rm tests/pbf/11-328-791.vector.pbf.out
|
||||
@@ -264,7 +266,7 @@ pbf-test:
|
||||
cmp tests/pbf/11-328-791.3857.json tests/pbf/11-328-791.3857.vector.pbf.out
|
||||
rm tests/pbf/11-328-791.3857.vector.pbf.out
|
||||
|
||||
enumerate-test:
|
||||
enumerate-test: tippecanoe tippecanoe-enumerate
|
||||
./tippecanoe -q -z5 -f -o tests/ne_110m_admin_0_countries/out/enum.mbtiles tests/ne_110m_admin_0_countries/in.json.gz
|
||||
./tippecanoe-enumerate tests/ne_110m_admin_0_countries/out/enum.mbtiles > tests/ne_110m_admin_0_countries/out/enum.check
|
||||
cmp tests/ne_110m_admin_0_countries/out/enum.check tests/ne_110m_admin_0_countries/out/enum
|
||||
@@ -276,6 +278,12 @@ overzoom-test: tippecanoe-overzoom
|
||||
./tippecanoe-decode tests/pbf/13-1310-3166.pbf 13 1310 3166 > tests/pbf/13-1310-3166.pbf.json.check
|
||||
cmp tests/pbf/13-1310-3166.pbf.json.check tests/pbf/13-1310-3166.pbf.json
|
||||
rm tests/pbf/13-1310-3166.pbf tests/pbf/13-1310-3166.pbf.json.check
|
||||
# Make sure feature order is stable
|
||||
./tippecanoe-overzoom --preserve-input-order -o tests/pbf/11-327-791-out.pbf tests/pbf/11-327-791.pbf 11/327/791 11/327/791
|
||||
./tippecanoe-decode tests/pbf/11-327-791.pbf 11 327 791 > tests/pbf/11-327-791.json
|
||||
./tippecanoe-decode tests/pbf/11-327-791-out.pbf 11 327 791 > tests/pbf/11-327-791-out.json
|
||||
cmp tests/pbf/11-327-791.json tests/pbf/11-327-791-out.json
|
||||
rm tests/pbf/11-327-791.json tests/pbf/11-327-791-out.json tests/pbf/11-327-791-out.pbf
|
||||
# Different detail and buffer, and attribute stripping
|
||||
./tippecanoe-overzoom -d8 -b30 -y NAME -y name -y scalerank -o tests/pbf/13-1310-3166-8-30.pbf tests/pbf/11-327-791.pbf 11/327/791 13/1310/3166
|
||||
./tippecanoe-decode tests/pbf/13-1310-3166-8-30.pbf 13 1310 3166 > tests/pbf/13-1310-3166-8-30.pbf.json.check
|
||||
@@ -285,8 +293,60 @@ overzoom-test: tippecanoe-overzoom
|
||||
./tippecanoe-overzoom -o tests/pbf/14-2616-6331.pbf tests/pbf/11-327-791.pbf 11/327/791 14/2616/6331
|
||||
cmp tests/pbf/14-2616-6331.pbf /dev/null
|
||||
rm tests/pbf/14-2616-6331.pbf
|
||||
# Thinning
|
||||
# 243 features in the source tile tests/pbf/0-0-0-pop.pbf
|
||||
# 9 of them survive as the best of each cluster of 30
|
||||
# ./tippecanoe -z1 -r30 --retain-points-multiplier 30 -f -e out.dir tests/ne_110m_populated_places/in.json
|
||||
# cp out.dir/0/0/0.pbf tests/pbf/0-0-0-pop.pbf
|
||||
./tippecanoe-overzoom -y NAME -m -o tests/pbf/0-0-0-pop-filtered.pbf tests/pbf/0-0-0-pop.pbf 0/0/0 0/0/0
|
||||
./tippecanoe-decode tests/pbf/0-0-0-pop-filtered.pbf 0 0 0 > tests/pbf/0-0-0-pop-filtered.pbf.json.check
|
||||
cmp tests/pbf/0-0-0-pop-filtered.pbf.json.check tests/pbf/0-0-0-pop-filtered.pbf.json
|
||||
rm tests/pbf/0-0-0-pop-filtered.pbf tests/pbf/0-0-0-pop-filtered.pbf.json.check
|
||||
# Thinning with accumulation
|
||||
./tippecanoe-overzoom -y NAME -m --accumulate-attribute NAME:comma -o tests/pbf/0-0-0-pop-accum.pbf tests/pbf/0-0-0-pop.pbf 0/0/0 0/0/0
|
||||
./tippecanoe-decode tests/pbf/0-0-0-pop-accum.pbf 0 0 0 > tests/pbf/0-0-0-pop-accum.pbf.json.check
|
||||
cmp tests/pbf/0-0-0-pop-accum.pbf.json.check tests/pbf/0-0-0-pop-accum.pbf.json
|
||||
rm tests/pbf/0-0-0-pop-accum.pbf tests/pbf/0-0-0-pop-accum.pbf.json.check
|
||||
# Filtering
|
||||
# 243 features in the source tile tests/pbf/0-0-0-pop.pbf
|
||||
# 27 of them match the filter and are retained
|
||||
./tippecanoe-overzoom -y NAME -j'{"*":["SCALERANK","eq",0]}' -o tests/pbf/0-0-0-pop-expr.pbf tests/pbf/0-0-0-pop.pbf 0/0/0 0/0/0
|
||||
./tippecanoe-decode tests/pbf/0-0-0-pop-expr.pbf 0 0 0 > tests/pbf/0-0-0-pop-expr.pbf.json.check
|
||||
cmp tests/pbf/0-0-0-pop-expr.pbf.json.check tests/pbf/0-0-0-pop-expr.pbf.json
|
||||
rm tests/pbf/0-0-0-pop-expr.pbf tests/pbf/0-0-0-pop-expr.pbf.json.check
|
||||
# Filtering with multiplier
|
||||
# 243 features in the source tile tests/pbf/0-0-0-pop.pbf
|
||||
# 8 features survive into the output, from 9 clusters of 30
|
||||
./tippecanoe-overzoom -y NAME -y SCALERANK -j'{"*":["SCALERANK","eq",0]}' -m -o tests/pbf/0-0-0-filter-mult.pbf tests/pbf/0-0-0-pop.pbf 0/0/0 0/0/0
|
||||
./tippecanoe-decode tests/pbf/0-0-0-filter-mult.pbf 0 0 0 > tests/pbf/0-0-0-filter-mult.pbf.json.check
|
||||
cmp tests/pbf/0-0-0-filter-mult.pbf.json.check tests/pbf/0-0-0-filter-mult.pbf.json
|
||||
rm tests/pbf/0-0-0-filter-mult.pbf tests/pbf/0-0-0-filter-mult.pbf.json.check
|
||||
# Filtering with multiplier and preserve-input-order
|
||||
# 243 features in the source tile tests/pbf/0-0-0-pop.pbf
|
||||
./tippecanoe-overzoom -y NAME -y SCALERANK -j'{"*":["NAME","cn","e"]}' -m --preserve-input-order -o tests/pbf/0-0-0-filter-mult-order.pbf tests/pbf/0-0-0-pop.pbf 0/0/0 0/0/0
|
||||
./tippecanoe-decode tests/pbf/0-0-0-filter-mult-order.pbf 0 0 0 > tests/pbf/0-0-0-filter-mult-order.pbf.json.check
|
||||
cmp tests/pbf/0-0-0-filter-mult-order.pbf.json.check tests/pbf/0-0-0-filter-mult-order.pbf.json
|
||||
rm tests/pbf/0-0-0-filter-mult-order.pbf tests/pbf/0-0-0-filter-mult-order.pbf.json.check
|
||||
# Test that overzooming with a multiplier exactly reverses the effect of tiling with a multiplier
|
||||
./tippecanoe -q -z5 --preserve-point-density-threshold 8 --retain-points-multiplier 3 -f -e tests/muni/out/out.dir tests/muni/muni.json
|
||||
./tippecanoe -q -z5 --preserve-point-density-threshold 8 -f -o tests/muni/out/out.mbtiles tests/muni/muni.json
|
||||
./tippecanoe-overzoom -m -o tests/muni/out/out.dir/000.pbf tests/muni/out/out.dir/0/0/0.pbf 0/0/0 0/0/0
|
||||
./tippecanoe-decode tests/muni/out/out.mbtiles 0 0 0 > tests/muni/out/out.dir/direct.json
|
||||
./tippecanoe-decode tests/muni/out/out.dir/000.pbf 0 0 0 > tests/muni/out/out.dir/overzoomed.json
|
||||
cmp tests/muni/out/out.dir/overzoomed.json tests/muni/out/out.dir/direct.json
|
||||
rm -rf tests/muni/out/out.dir tests/muni/out/out.mbtiles tests/muni/out/out.dir/overzoomed.json tests/muni/out/out.dir/direct.json
|
||||
# Test filter with null attribute
|
||||
./tippecanoe-overzoom -j '{"*":["name","ni",[1,5,6,9]]}' -o tests/pbf/12-2145-1391-filter1.pbf tests/pbf/12-2145-1391.pbf 12/2145/1391 12/2145/1391
|
||||
./tippecanoe-decode tests/pbf/12-2145-1391-filter1.pbf 12 2145 1391 > tests/pbf/12-2145-1391-filter1.pbf.json.check
|
||||
cmp tests/pbf/12-2145-1391-filter1.pbf.json.check tests/pbf/12-2145-1391-filter1.pbf.json
|
||||
rm tests/pbf/12-2145-1391-filter1.pbf.json.check tests/pbf/12-2145-1391-filter1.pbf
|
||||
# Test filter with null attribute in "ni" list
|
||||
./tippecanoe-overzoom -j '{"*":["name","ni",[1,5,6,9,null]]}' -o tests/pbf/12-2145-1391-filter2.pbf tests/pbf/12-2145-1391.pbf 12/2145/1391 12/2145/1391
|
||||
./tippecanoe-decode tests/pbf/12-2145-1391-filter2.pbf 12 2145 1391 > tests/pbf/12-2145-1391-filter2.pbf.json.check
|
||||
cmp tests/pbf/12-2145-1391-filter2.pbf.json.check tests/pbf/12-2145-1391-filter2.pbf.json
|
||||
rm tests/pbf/12-2145-1391-filter2.pbf.json.check tests/pbf/12-2145-1391-filter2.pbf
|
||||
|
||||
join-test: tile-join
|
||||
join-test: tippecanoe tippecanoe-decode tile-join
|
||||
./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles -YALAND10:'Land area' -L'{"file": "tests/join-population/tabblock_06001420.json", "description": "population"}'
|
||||
./tippecanoe -q -f -Z5 -z10 -o tests/join-population/macarthur.mbtiles -l macarthur tests/join-population/macarthur.json
|
||||
./tile-join -q -f -Z6 -z9 -o tests/join-population/macarthur-6-9.mbtiles tests/join-population/macarthur.mbtiles
|
||||
@@ -398,16 +458,30 @@ join-test: tile-join
|
||||
./tippecanoe-decode -x generator -x generator_options -x name -x description tests/join-population/empty.pmtiles > tests/join-population/empty.out.json.check
|
||||
cmp tests/join-population/empty.out.json.check tests/join-population/empty.out.json
|
||||
rm -f tests/join-population/empty.pmtiles tests/join-population/empty.out.pmtiles tests/join-population/empty.out.json.check
|
||||
# pmtiles again, with --overzoom
|
||||
./tippecanoe -q -z0 -f -o tests/join-population/empty.pmtiles tests/join-population/empty.json
|
||||
./tile-join --overzoom -f -o tests/join-population/empty.out.pmtiles tests/join-population/empty.pmtiles
|
||||
./tippecanoe-decode -x generator -x generator_options -x name -x description tests/join-population/empty.pmtiles > tests/join-population/empty.out.json.check
|
||||
cmp tests/join-population/empty.out.json.check tests/join-population/empty.out.json
|
||||
rm -f tests/join-population/empty.pmtiles tests/join-population/empty.out.pmtiles tests/join-population/empty.out.json.check
|
||||
# dirtiles:
|
||||
./tippecanoe -q -z0 -f -e tests/join-population/empty.dirtiles tests/join-population/empty.json
|
||||
./tile-join -f -e tests/join-population/empty.out.dirtiles tests/join-population/empty.dirtiles
|
||||
./tippecanoe-decode -x generator -x generator_options -x name -x description tests/join-population/empty.dirtiles > tests/join-population/empty.out.json.check
|
||||
cmp tests/join-population/empty.out.json.check tests/join-population/empty.out.json
|
||||
rm -rf tests/join-population/empty.dirtiles tests/join-population/empty.out.dirtiles tests/join-population/empty.out.json.check
|
||||
#
|
||||
# Test overzooming of tilesets with different maxzooms
|
||||
#
|
||||
mkdir -p tests/ne_110m_ocean/join
|
||||
./tippecanoe -q -z2 -f -o tests/ne_110m_ocean/join/ocean.mbtiles tests/ne_110m_ocean/in.json
|
||||
./tippecanoe -q -z4 -d8 -y name -f -o tests/ne_110m_ocean/join/countries.mbtiles tests/ne_110m_admin_0_countries/in.json.gz
|
||||
./tile-join --overzoom -f -o tests/ne_110m_ocean/join/joined.mbtiles tests/ne_110m_ocean/join/ocean.mbtiles tests/ne_110m_ocean/join/countries.mbtiles
|
||||
./tippecanoe-decode -x generator tests/ne_110m_ocean/join/joined.mbtiles > tests/ne_110m_ocean/join/joined.mbtiles.json.check
|
||||
cmp tests/ne_110m_ocean/join/joined.mbtiles.json.check tests/ne_110m_ocean/join/joined.mbtiles.json
|
||||
rm -f tests/ne_110m_ocean/join/ocean.mbtiles tests/ne_110m_ocean/join/countries.mbtiles tests/ne_110m_ocean/join/joined.mbtiles tests/ne_110m_ocean/join/joined.mbtiles.json.check
|
||||
|
||||
|
||||
|
||||
join-filter-test:
|
||||
join-filter-test: tippecanoe tippecanoe-decode tile-join
|
||||
# Comes out different from the direct tippecanoe run because null attributes are lost
|
||||
./tippecanoe -q -z0 -f -o tests/feature-filter/out/all.mbtiles tests/feature-filter/in.json
|
||||
./tile-join -q -J tests/feature-filter/filter -f -o tests/feature-filter/out/filtered.mbtiles tests/feature-filter/out/all.mbtiles
|
||||
@@ -430,7 +504,7 @@ json-tool-test: tippecanoe-json-tool
|
||||
rm -f tests/join-population/tabblock_06001420.json.sort tests/join-population/tabblock_06001420.json.sort.joined
|
||||
rm -f tests/join-population/tabblock_06001420-null.json.sort.joined
|
||||
|
||||
allow-existing-test:
|
||||
allow-existing-test: tippecanoe
|
||||
# Make a tileset
|
||||
./tippecanoe -q -Z0 -z0 -f -o tests/allow-existing/both.mbtiles tests/coalesce-tract/tl_2010_06001_tract10.json
|
||||
# Writing to existing should fail
|
||||
@@ -459,7 +533,7 @@ allow-existing-test:
|
||||
if ./tippecanoe -q -Z10 -z11 -F -o tests/allow-existing/both.pmtiles tests/coalesce-tract/tl_2010_06001_tract10.json; then exit 1; else exit 0; fi
|
||||
rm -r tests/allow-existing/both.pmtiles tests/allow-existing/both.dir.json.check tests/allow-existing/both.dir tests/allow-existing/both.mbtiles.json.check tests/allow-existing/both.mbtiles
|
||||
|
||||
csv-test:
|
||||
csv-test: tippecanoe tippecanoe-decode
|
||||
# Reading from named CSV
|
||||
./tippecanoe -q -zg -f -o tests/csv/out.mbtiles tests/csv/ne_110m_populated_places_simple.csv
|
||||
./tippecanoe-decode -x generator -x generator_options tests/csv/out.mbtiles > tests/csv/out.mbtiles.json.check
|
||||
@@ -476,7 +550,7 @@ csv-test:
|
||||
cmp tests/csv/out.mbtiles.json.check tests/csv/out.mbtiles.json
|
||||
rm -f tests/csv/out.mbtiles.json.check tests/csv/out.mbtiles
|
||||
|
||||
layer-json-test:
|
||||
layer-json-test: tippecanoe tippecanoe-decode
|
||||
# GeoJSON with description and named layer
|
||||
./tippecanoe -q -z0 -r1 -yNAME -f -o tests/layer-json/out.mbtiles -L'{"file":"tests/ne_110m_populated_places/in.json", "description":"World cities", "layer":"places"}'
|
||||
./tippecanoe-decode -x generator -x generator_options tests/layer-json/out.mbtiles > tests/layer-json/out.mbtiles.json.check
|
||||
|
||||
@@ -32,7 +32,13 @@ significant travel corridor.
|
||||
Installation
|
||||
------------
|
||||
|
||||
For this fork you will need to build from the source repository:
|
||||
The easiest way to install tippecanoe on OSX is with [Homebrew](http://brew.sh/):
|
||||
|
||||
```sh
|
||||
$ brew install tippecanoe
|
||||
```
|
||||
|
||||
On Ubuntu it will usually be easiest to build from the source repository:
|
||||
|
||||
```sh
|
||||
$ git clone https://github.com/felt/tippecanoe.git
|
||||
@@ -53,7 +59,7 @@ $ tippecanoe -o file.mbtiles [options] [file.json file.json.gz file.fgb ...]
|
||||
```
|
||||
|
||||
If no files are specified, it reads GeoJSON from the standard input.
|
||||
If multiple files are specified, each is placed in its own layer.
|
||||
If multiple files are specified, each is placed [in its own layer](#input-files-and-layer-names).
|
||||
|
||||
The GeoJSON features need not be wrapped in a FeatureCollection.
|
||||
You can concatenate multiple GeoJSON features or files together,
|
||||
@@ -341,6 +347,8 @@ Parallel processing will also be automatic if the input file is in FlatGeobuf fo
|
||||
* `-ae` or `--extend-zooms-if-still-dropping`: Increase the maxzoom if features are still being dropped at that zoom level.
|
||||
The detail and simplification options that ordinarily apply only to the maximum zoom level will apply both to the originally
|
||||
specified maximum zoom and to any levels added beyond that.
|
||||
* `--extend-zooms-if-still-dropping-maximum=`_count_: Increase the maxzoom if features are still being dropped at that zoom level
|
||||
by up to _count_ zoom levels.
|
||||
* `-R` _zoom_`/`_x_`/`_y_ or `--one-tile=`_zoom_`/`_x_`/`_y_: Set the minzoom and maxzoom to _zoom_ and produce only
|
||||
the single specified tile at that zoom level.
|
||||
|
||||
@@ -372,8 +380,8 @@ zoom level | precision (ft) | precision (m) | map scale
|
||||
`-z18` | 1.5 in | 4 cm | 1:1250
|
||||
`-z19` | 0.8 in | 2 cm | 1:600
|
||||
`-z20` | 0.4 in | 1 cm | 1:300
|
||||
`-z21` | 0.2 in | 0.5 cm | 1:150
|
||||
`-z22` | 0.1 in | 0.25 cm | 1:75
|
||||
`-z21` | 0.4 in | 1 cm | 1:300
|
||||
`-z22` | 0.4 in | 1 cm | 1:300
|
||||
|
||||
### Tile resolution
|
||||
|
||||
@@ -415,7 +423,7 @@ be reduced to the maximum that can be used with the specified _maxzoom_.
|
||||
|
||||
### Filtering features by attributes
|
||||
|
||||
* `-j` *filter* or `--feature-filter`=*filter*: Check features against a per-layer filter (as defined in the [Mapbox GL Style Specification](https://docs.mapbox.com/mapbox-gl-js/style-spec/#other-filter)) and only include those that match. Any features in layers that have no filter specified will be passed through. Filters for the layer `"*"` apply to all layers. The special variable `$zoom` refers to the current zoom level.
|
||||
* `-j` *filter* or `--feature-filter`=*filter*: Check features against a per-layer filter (as defined in the [Mapbox GL Style Specification](https://docs.mapbox.com/mapbox-gl-js/style-spec/#other-filter) or in a Felt filter specification still to be finalized) and only include those that match. Any features in layers that have no filter specified will be passed through. Filters for the layer `"*"` apply to all layers. The special variable `$zoom` refers to the current zoom level.
|
||||
* `-J` *filter-file* or `--feature-filter-file`=*filter-file*: Like `-j`, but read the filter from a file.
|
||||
|
||||
Example: to find the Natural Earth countries with low `scalerank` but high `LABELRANK`:
|
||||
@@ -453,6 +461,7 @@ the same layer, enclose them in an `all` expression so they will all be evaluate
|
||||
If you use `-Bg`, it will guess a zoom level that will keep at most 50,000 features in the densest tile.
|
||||
You can also specify a marker-width with `-Bg`*width* to allow fewer features in the densest tile to
|
||||
compensate for the larger marker, or `-Bf`*number* to allow at most *number* features in the densest tile.
|
||||
* `--retain-points-multiplier=`_multiple_: Retain the specified multiple of points instead of just the number of points that would ordinarily be retained by the drop rate. These can be thinned out later with the `-m` option to `tippecanoe-overzoom`. The start of each cluster is marked in the feature sequence by the `tippecanoe:retain_points_multiplier_first` attribute. The `--tile-size-limit` will also be extended at low zoom levels to allow for the multiplied features.
|
||||
* `--drop-denser=`_percentage_: When dropping dots at zoom levels below the base zoom, give the specified _percentage_
|
||||
preference to retaining points in sparse areas and dropping points in dense areas.
|
||||
* `--limit-base-zoom-to-maximum-zoom` or `-Pb`: Limit the guessed base zoom not to exceed the maxzoom, even if this would put more than the requested number of features in a base zoom tile.
|
||||
@@ -486,14 +495,15 @@ the same layer, enclose them in an `all` expression so they will all be evaluate
|
||||
* `-ps` or `--no-line-simplification`: Don't simplify lines and polygons
|
||||
* `-pS` or `--simplify-only-low-zooms`: Don't simplify lines and polygons at maxzoom (but do simplify at lower zooms)
|
||||
* `--simplification-at-maximum-zoom=`_scale_: Use the specified _scale_ at maxzoom instead of the standard simplification scale (which still applies at lower zooms)
|
||||
* `-pn` or `--no-simplification-of-shared-nodes`: Don't simplify away nodes that appear in more than one feature or are used multiple times within the same feature, so that the intersection node will not be lost from intersecting roads. (This will not be effective if you also use `--coalesce` or `--detect-shared-borders`.)
|
||||
* `-pn` or `--no-simplification-of-shared-nodes`: Don't simplify away nodes at which LineStrings or Polygon rings converge, diverge, or cross. (This will not be effective if you also use `--coalesce`.) In between intersection nodes, LineString segments or polygon edges will be simplified identically in each feature if possible. Use this instead of `--detect-shared-borders`.
|
||||
* `-pt` or `--no-tiny-polygon-reduction`: Don't combine the area of very small polygons into small squares that represent their combined area.
|
||||
* `-pT` or `--no-tiny-polygon-reduction-at-maximum-zoom`: Combine the area of very small polygons into small squares that represent their combined area only at zoom levels below the maximum.
|
||||
* `--tiny-polygon-size=`_size_: Use the specified _size_ for tiny polygons instead of the default 2. Anything above 6 or so will lead to visible artifacts with the default tile detail.
|
||||
* `-av` or `--visvalingam`: Use Visvalingam's simplification algorithm rather than Douglas-Peucker's.
|
||||
|
||||
### Attempts to improve shared polygon boundaries
|
||||
|
||||
* `-ab` or `--detect-shared-borders`: In the manner of [TopoJSON](https://github.com/mbostock/topojson/wiki/Introduction), detect borders that are shared between multiple polygons and simplify them identically in each polygon. This takes more time and memory than considering each polygon individually.
|
||||
* `-ab` or `--detect-shared-borders`: DEPRECATED. In the manner of [TopoJSON](https://github.com/mbostock/topojson/wiki/Introduction), detect borders that are shared between multiple polygons and simplify them identically in each polygon. This takes more time and memory than considering each polygon individually. Use `no-simplification-of-shared-nodes` instead, which is faster and more correct.
|
||||
* `-aL` or `--grid-low-zooms`: At all zoom levels below _maxzoom_, snap all lines and polygons to a stairstep grid instead of allowing diagonals. You will also want to specify a tile resolution, probably `-D8`. This option provides a way to display continuous parcel, gridded, or binned data at low zooms without overwhelming the tiles with tiny polygons, since features will either get stretched out to the grid unit or lost entirely, depending on how they happened to be aligned in the original data. You probably don't want to use this.
|
||||
|
||||
### Controlling clipping to tile boundaries
|
||||
@@ -765,6 +775,11 @@ The options are:
|
||||
* `-f` or `--force`: Remove *out.mbtiles* if it already exists.
|
||||
* `-r` or `--read-from`: list of input mbtiles to read from.
|
||||
|
||||
### Overzooming
|
||||
|
||||
* `--overzoom`: If one of the source tilesets has a larger maxzoom than the others, scale up tiles from the tilesets with the lower maxzooms so they will all have the same maxzoom in the output tileset.
|
||||
* `--buffer=`_pixels_ or `-b` _pixels_: Set the size of the tile buffer in the overzoomed tiles.
|
||||
|
||||
### Tileset description and attribution
|
||||
|
||||
* `-A` *attribution* or `--attribution=`*attribution*: Set the attribution string.
|
||||
@@ -981,4 +996,7 @@ reads tile `inz/inx/iny` of `in.mvt.gz` and produces tile `outz/outx/outy` of `o
|
||||
* `-b` *buffer*: Set the tile buffer in the output tile (default 5)
|
||||
* `-d` *detail*: Set the detail of the output tile (default 12)
|
||||
* `-y` *attribute*: Retain the specified *attribute* in the output features. All attributes that are not named in a `-y` option will be removed.
|
||||
|
||||
* `-j` *filter*: Filter features using the same expression syntax as in tippecanoe.
|
||||
* `-m`: If a tile was created with the `--retain-points-multiplier` option, thin the tile back down to its normal feature count during overzooming. The first feature from each cluster will be retained, unless `-j` is used to specify a filter, in which case the first matching filter from each cluster will be retained instead.
|
||||
* `--preserve-input-order`: Restore a set of filtered features to its original input order
|
||||
* `--accumulate-attribute`: Behaves as in `tippecanoe` to sum attributes from the features of a multiplier cluster that are not included in the final output. The attributes from features that are filtered away with `-j` are *not* accumulated onto the output feature.
|
||||
|
||||
+146
@@ -0,0 +1,146 @@
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include "attribute.hpp"
|
||||
#include "errors.hpp"
|
||||
#include "serial.hpp"
|
||||
#include "jsonpull/jsonpull.h"
|
||||
#include "milo/dtoa_milo.h"
|
||||
|
||||
void set_attribute_accum(std::unordered_map<std::string, attribute_op> &attribute_accum, std::string name, std::string type) {
|
||||
attribute_op t;
|
||||
|
||||
if (type == "sum") {
|
||||
t = op_sum;
|
||||
} else if (type == "product") {
|
||||
t = op_product;
|
||||
} else if (type == "mean") {
|
||||
t = op_mean;
|
||||
} else if (type == "max") {
|
||||
t = op_max;
|
||||
} else if (type == "min") {
|
||||
t = op_min;
|
||||
} else if (type == "concat") {
|
||||
t = op_concat;
|
||||
} else if (type == "comma") {
|
||||
t = op_comma;
|
||||
} else {
|
||||
fprintf(stderr, "Attribute method (%s) must be sum, product, mean, max, min, concat, or comma\n", type.c_str());
|
||||
exit(EXIT_ARGS);
|
||||
}
|
||||
|
||||
attribute_accum.insert(std::pair<std::string, attribute_op>(name, t));
|
||||
}
|
||||
|
||||
void set_attribute_accum(std::unordered_map<std::string, attribute_op> &attribute_accum, const char *arg, char **argv) {
|
||||
if (*arg == '{') {
|
||||
json_pull *jp = json_begin_string(arg);
|
||||
json_object *o = json_read_tree(jp);
|
||||
|
||||
if (o == NULL) {
|
||||
fprintf(stderr, "%s: -E%s: %s\n", *argv, arg, jp->error);
|
||||
exit(EXIT_JSON);
|
||||
}
|
||||
|
||||
if (o->type != JSON_HASH) {
|
||||
fprintf(stderr, "%s: -E%s: not a JSON object\n", *argv, arg);
|
||||
exit(EXIT_JSON);
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < o->value.object.length; i++) {
|
||||
json_object *k = o->value.object.keys[i];
|
||||
json_object *v = o->value.object.values[i];
|
||||
|
||||
if (k->type != JSON_STRING) {
|
||||
fprintf(stderr, "%s: -E%s: key %zu not a string\n", *argv, arg, i);
|
||||
exit(EXIT_JSON);
|
||||
}
|
||||
if (v->type != JSON_STRING) {
|
||||
fprintf(stderr, "%s: -E%s: value %zu not a string\n", *argv, arg, i);
|
||||
exit(EXIT_JSON);
|
||||
}
|
||||
|
||||
set_attribute_accum(attribute_accum, k->value.string.string, v->value.string.string);
|
||||
}
|
||||
|
||||
json_free(o);
|
||||
json_end(jp);
|
||||
return;
|
||||
}
|
||||
|
||||
const char *s = strchr(arg, ':');
|
||||
if (s == NULL) {
|
||||
fprintf(stderr, "-E%s option must be in the form -Ename:method\n", arg);
|
||||
exit(EXIT_ARGS);
|
||||
}
|
||||
|
||||
std::string name = std::string(arg, s - arg);
|
||||
std::string type = std::string(s + 1);
|
||||
|
||||
set_attribute_accum(attribute_accum, name, type);
|
||||
}
|
||||
|
||||
void preserve_attribute(attribute_op const &op, std::string const &key, serial_val const &val, std::vector<std::string> &full_keys, std::vector<serial_val> &full_values, std::unordered_map<std::string, accum_state> &attribute_accum_state) {
|
||||
for (size_t i = 0; i < full_keys.size(); i++) {
|
||||
if (key == full_keys[i]) {
|
||||
switch (op) {
|
||||
case op_sum:
|
||||
full_values[i].s = milo::dtoa_milo(atof(full_values[i].s.c_str()) + atof(val.s.c_str()));
|
||||
full_values[i].type = mvt_double;
|
||||
break;
|
||||
|
||||
case op_product:
|
||||
full_values[i].s = milo::dtoa_milo(atof(full_values[i].s.c_str()) * atof(val.s.c_str()));
|
||||
full_values[i].type = mvt_double;
|
||||
break;
|
||||
|
||||
case op_max: {
|
||||
double existing = atof(full_values[i].s.c_str());
|
||||
double maybe = atof(val.s.c_str());
|
||||
if (maybe > existing) {
|
||||
full_values[i].s = val.s.c_str();
|
||||
full_values[i].type = mvt_double;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case op_min: {
|
||||
double existing = atof(full_values[i].s.c_str());
|
||||
double maybe = atof(val.s.c_str());
|
||||
if (maybe < existing) {
|
||||
full_values[i].s = val.s.c_str();
|
||||
full_values[i].type = mvt_double;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case op_mean: {
|
||||
auto state = attribute_accum_state.find(key);
|
||||
if (state == attribute_accum_state.end()) {
|
||||
accum_state s;
|
||||
s.sum = atof(full_values[i].s.c_str()) + atof(val.s.c_str());
|
||||
s.count = 2;
|
||||
attribute_accum_state.insert(std::pair<std::string, accum_state>(key, s));
|
||||
|
||||
full_values[i].s = milo::dtoa_milo(s.sum / s.count);
|
||||
} else {
|
||||
state->second.sum += atof(val.s.c_str());
|
||||
state->second.count += 1;
|
||||
|
||||
full_values[i].s = milo::dtoa_milo(state->second.sum / state->second.count);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case op_concat:
|
||||
full_values[i].s += val.s;
|
||||
full_values[i].type = mvt_string;
|
||||
break;
|
||||
|
||||
case op_comma:
|
||||
full_values[i].s += std::string(",") + val.s;
|
||||
full_values[i].type = mvt_string;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
#ifndef ATTRIBUTE_HPP
|
||||
#define ATTRIBUTE_HPP
|
||||
|
||||
#include <vector>
|
||||
#include <unordered_map>
|
||||
|
||||
enum attribute_op {
|
||||
op_sum,
|
||||
op_product,
|
||||
op_mean,
|
||||
op_concat,
|
||||
op_comma,
|
||||
op_max,
|
||||
op_min,
|
||||
};
|
||||
|
||||
struct accum_state {
|
||||
double sum = 0;
|
||||
double count = 0;
|
||||
};
|
||||
|
||||
struct serial_val;
|
||||
|
||||
void set_attribute_accum(std::unordered_map<std::string, attribute_op> &attribute_accum, std::string name, std::string type);
|
||||
void set_attribute_accum(std::unordered_map<std::string, attribute_op> &attribute_accum, const char *arg, char **argv);
|
||||
void preserve_attribute(attribute_op const &op, const std::string &key, serial_val const &val, std::vector<std::string> &full_keys, std::vector<serial_val> &full_values, std::unordered_map<std::string, accum_state> &attribute_accum_state);
|
||||
|
||||
#endif
|
||||
+16245
-8793
File diff suppressed because it is too large
Load Diff
@@ -1,17 +1,27 @@
|
||||
#include <stdlib.h>
|
||||
#include <mapbox/geometry/point.hpp>
|
||||
#include <mapbox/geometry/multi_polygon.hpp>
|
||||
#include <mapbox/geometry/wagyu/wagyu.hpp>
|
||||
#include <mapbox/geometry/wagyu/quick_clip.hpp>
|
||||
#include <mapbox/geometry/snap_rounding.hpp>
|
||||
#include <limits.h>
|
||||
#include "geometry.hpp"
|
||||
#include "errors.hpp"
|
||||
#include "compression.hpp"
|
||||
#include "mvt.hpp"
|
||||
#include "evaluator.hpp"
|
||||
#include "serial.hpp"
|
||||
#include "attribute.hpp"
|
||||
|
||||
drawvec simple_clip_poly(drawvec &geom, long long minx, long long miny, long long maxx, long long maxy) {
|
||||
static std::vector<std::pair<double, double>> clip_poly1(std::vector<std::pair<double, double>> &geom,
|
||||
long long minx, long long miny, long long maxx, long long maxy,
|
||||
long long ax, long long ay, long long bx, long long by, drawvec &edge_nodes,
|
||||
bool prevent_simplify_shared_nodes);
|
||||
|
||||
drawvec simple_clip_poly(drawvec &geom, long long minx, long long miny, long long maxx, long long maxy,
|
||||
long long ax, long long ay, long long bx, long long by, drawvec &edge_nodes, bool prevent_simplify_shared_nodes) {
|
||||
drawvec out;
|
||||
|
||||
mapbox::geometry::point<long long> min(minx, miny);
|
||||
mapbox::geometry::point<long long> max(maxx, maxy);
|
||||
mapbox::geometry::box<long long> bbox(min, max);
|
||||
if (prevent_simplify_shared_nodes) {
|
||||
geom = remove_noop(geom, VT_POLYGON, 0);
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (geom[i].op == VT_MOVETO) {
|
||||
@@ -22,24 +32,24 @@ drawvec simple_clip_poly(drawvec &geom, long long minx, long long miny, long lon
|
||||
}
|
||||
}
|
||||
|
||||
mapbox::geometry::linear_ring<long long> ring;
|
||||
std::vector<std::pair<double, double>> tmp;
|
||||
for (size_t k = i; k < j; k++) {
|
||||
ring.push_back(mapbox::geometry::point<long long>(geom[k].x, geom[k].y));
|
||||
double x = geom[k].x;
|
||||
double y = geom[k].y;
|
||||
tmp.emplace_back(x, y);
|
||||
}
|
||||
|
||||
mapbox::geometry::linear_ring<long long> lr = mapbox::geometry::wagyu::quick_clip::quick_lr_clip(ring, bbox);
|
||||
|
||||
if (lr.size() > 0) {
|
||||
for (size_t k = 0; k < lr.size(); k++) {
|
||||
if (k == 0) {
|
||||
out.push_back(draw(VT_MOVETO, lr[k].x, lr[k].y));
|
||||
} else {
|
||||
out.push_back(draw(VT_LINETO, lr[k].x, lr[k].y));
|
||||
}
|
||||
tmp = clip_poly1(tmp, minx, miny, maxx, maxy, ax, ay, bx, by, edge_nodes, prevent_simplify_shared_nodes);
|
||||
if (tmp.size() > 0) {
|
||||
if (tmp[0].first != tmp[tmp.size() - 1].first || tmp[0].second != tmp[tmp.size() - 1].second) {
|
||||
fprintf(stderr, "Internal error: Polygon ring not closed\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (lr.size() > 0 && lr[0] != lr[lr.size() - 1]) {
|
||||
out.push_back(draw(VT_LINETO, lr[0].x, lr[0].y));
|
||||
}
|
||||
for (size_t k = 0; k < tmp.size(); k++) {
|
||||
if (k == 0) {
|
||||
out.push_back(draw(VT_MOVETO, std::round(tmp[k].first), std::round(tmp[k].second)));
|
||||
} else {
|
||||
out.push_back(draw(VT_LINETO, std::round(tmp[k].first), std::round(tmp[k].second)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,11 +63,17 @@ drawvec simple_clip_poly(drawvec &geom, long long minx, long long miny, long lon
|
||||
return out;
|
||||
}
|
||||
|
||||
drawvec simple_clip_poly(drawvec &geom, int z, int buffer) {
|
||||
drawvec simple_clip_poly(drawvec &geom, long long minx, long long miny, long long maxx, long long maxy, bool prevent_simplify_shared_nodes) {
|
||||
drawvec dv;
|
||||
return simple_clip_poly(geom, minx, miny, maxx, maxy, minx, miny, maxx, maxy, dv, prevent_simplify_shared_nodes);
|
||||
}
|
||||
|
||||
drawvec simple_clip_poly(drawvec &geom, int z, int buffer, drawvec &edge_nodes, bool prevent_simplify_shared_nodes) {
|
||||
long long area = 1LL << (32 - z);
|
||||
long long clip_buffer = buffer * area / 256;
|
||||
|
||||
return simple_clip_poly(geom, -clip_buffer, -clip_buffer, area + clip_buffer, area + clip_buffer);
|
||||
return simple_clip_poly(geom, -clip_buffer, -clip_buffer, area + clip_buffer, area + clip_buffer,
|
||||
0, 0, area, area, edge_nodes, prevent_simplify_shared_nodes);
|
||||
}
|
||||
|
||||
drawvec clip_point(drawvec &geom, int z, long long buffer) {
|
||||
@@ -96,11 +112,11 @@ drawvec clip_lines(drawvec &geom, long long minx, long long miny, long long maxx
|
||||
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (i > 0 && (geom[i - 1].op == VT_MOVETO || geom[i - 1].op == VT_LINETO) && geom[i].op == VT_LINETO) {
|
||||
double x1 = geom[i - 1].x;
|
||||
double y1 = geom[i - 1].y;
|
||||
long long x1 = geom[i - 1].x;
|
||||
long long y1 = geom[i - 1].y;
|
||||
|
||||
double x2 = geom[i - 0].x;
|
||||
double y2 = geom[i - 0].y;
|
||||
long long x2 = geom[i - 0].x;
|
||||
long long y2 = geom[i - 0].y;
|
||||
|
||||
int c = clip(&x1, &y1, &x2, &y2, minx, miny, maxx, maxy);
|
||||
|
||||
@@ -127,7 +143,7 @@ drawvec clip_lines(drawvec &geom, long long minx, long long miny, long long maxx
|
||||
#define BOTTOM 4
|
||||
#define TOP 8
|
||||
|
||||
static int computeOutCode(double x, double y, double xmin, double ymin, double xmax, double ymax) {
|
||||
static int computeOutCode(long long x, long long y, long long xmin, long long ymin, long long xmax, long long ymax) {
|
||||
int code = INSIDE;
|
||||
|
||||
if (x < xmin) {
|
||||
@@ -145,7 +161,7 @@ static int computeOutCode(double x, double y, double xmin, double ymin, double x
|
||||
return code;
|
||||
}
|
||||
|
||||
int clip(double *x0, double *y0, double *x1, double *y1, double xmin, double ymin, double xmax, double ymax) {
|
||||
int clip(long long *x0, long long *y0, long long *x1, long long *y1, long long xmin, long long ymin, long long xmax, long long ymax) {
|
||||
int outcode0 = computeOutCode(*x0, *y0, xmin, ymin, xmax, ymax);
|
||||
int outcode1 = computeOutCode(*x1, *y1, xmin, ymin, xmax, ymax);
|
||||
int accept = 0;
|
||||
@@ -160,11 +176,13 @@ int clip(double *x0, double *y0, double *x1, double *y1, double xmin, double ymi
|
||||
} else {
|
||||
// failed both tests, so calculate the line segment to clip
|
||||
// from an outside point to an intersection with clip edge
|
||||
double x = *x0, y = *y0;
|
||||
long long x = *x0, y = *y0;
|
||||
|
||||
// At least one endpoint is outside the clip rectangle; pick it.
|
||||
int outcodeOut = outcode0 ? outcode0 : outcode1;
|
||||
|
||||
// XXX truncating division
|
||||
|
||||
// Now find the intersection point;
|
||||
// use formulas y = y0 + slope * (x - x0), x = x0 + (1 / slope) * (y - y0)
|
||||
if (outcodeOut & TOP) { // point is above the clip rectangle
|
||||
@@ -204,7 +222,7 @@ int clip(double *x0, double *y0, double *x1, double *y1, double xmin, double ymi
|
||||
}
|
||||
}
|
||||
|
||||
static void decode_clipped(mapbox::geometry::multi_polygon<long long> &t, drawvec &out) {
|
||||
static void decode_clipped(mapbox::geometry::multi_polygon<long long> &t, drawvec &out, double scale) {
|
||||
out.clear();
|
||||
|
||||
for (size_t i = 0; i < t.size(); i++) {
|
||||
@@ -212,7 +230,7 @@ static void decode_clipped(mapbox::geometry::multi_polygon<long long> &t, drawve
|
||||
drawvec ring;
|
||||
|
||||
for (size_t k = 0; k < t[i][j].size(); k++) {
|
||||
ring.push_back(draw((k == 0) ? VT_MOVETO : VT_LINETO, t[i][j][k].x, t[i][j][k].y));
|
||||
ring.push_back(draw((k == 0) ? VT_MOVETO : VT_LINETO, std::round(t[i][j][k].x / scale), std::round(t[i][j][k].y / scale)));
|
||||
}
|
||||
|
||||
if (ring.size() > 0 && ring[ring.size() - 1] != ring[0]) {
|
||||
@@ -234,61 +252,19 @@ static void decode_clipped(mapbox::geometry::multi_polygon<long long> &t, drawve
|
||||
}
|
||||
}
|
||||
|
||||
drawvec clean_or_clip_poly(drawvec &geom, int z, int buffer, bool clip) {
|
||||
mapbox::geometry::wagyu::wagyu<long long> wagyu;
|
||||
|
||||
drawvec clean_or_clip_poly(drawvec &geom, int z, int buffer, bool clip, bool try_scaling) {
|
||||
geom = remove_noop(geom, VT_POLYGON, 0);
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (geom[i].op == VT_MOVETO) {
|
||||
size_t j;
|
||||
for (j = i + 1; j < geom.size(); j++) {
|
||||
if (geom[j].op != VT_LINETO) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (j >= i + 4) {
|
||||
mapbox::geometry::linear_ring<long long> lr;
|
||||
|
||||
for (size_t k = i; k < j; k++) {
|
||||
lr.push_back(mapbox::geometry::point<long long>(geom[k].x, geom[k].y));
|
||||
}
|
||||
|
||||
if (lr.size() >= 3) {
|
||||
wagyu.add_ring(lr);
|
||||
}
|
||||
}
|
||||
|
||||
i = j - 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (clip) {
|
||||
long long area = 0xFFFFFFFF;
|
||||
if (z != 0) {
|
||||
area = 1LL << (32 - z);
|
||||
}
|
||||
long long clip_buffer = buffer * area / 256;
|
||||
|
||||
mapbox::geometry::linear_ring<long long> lr;
|
||||
|
||||
lr.push_back(mapbox::geometry::point<long long>(-clip_buffer, -clip_buffer));
|
||||
lr.push_back(mapbox::geometry::point<long long>(-clip_buffer, area + clip_buffer));
|
||||
lr.push_back(mapbox::geometry::point<long long>(area + clip_buffer, area + clip_buffer));
|
||||
lr.push_back(mapbox::geometry::point<long long>(area + clip_buffer, -clip_buffer));
|
||||
lr.push_back(mapbox::geometry::point<long long>(-clip_buffer, -clip_buffer));
|
||||
|
||||
wagyu.add_ring(lr, mapbox::geometry::wagyu::polygon_type_clip);
|
||||
}
|
||||
|
||||
mapbox::geometry::multi_polygon<long long> result;
|
||||
try {
|
||||
wagyu.execute(mapbox::geometry::wagyu::clip_type_union, result, mapbox::geometry::wagyu::fill_type_positive, mapbox::geometry::wagyu::fill_type_positive);
|
||||
} catch (std::runtime_error &e) {
|
||||
FILE *f = fopen("/tmp/wagyu.log", "w");
|
||||
fprintf(f, "%s\n", e.what());
|
||||
fprintf(stderr, "%s\n", e.what());
|
||||
fprintf(f, "[");
|
||||
|
||||
double scale = 16.0;
|
||||
if (!try_scaling) {
|
||||
scale = 1.0;
|
||||
}
|
||||
|
||||
bool again = true;
|
||||
while (again) {
|
||||
mapbox::geometry::wagyu::wagyu<long long> wagyu;
|
||||
again = false;
|
||||
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (geom[i].op == VT_MOVETO) {
|
||||
@@ -302,22 +278,12 @@ drawvec clean_or_clip_poly(drawvec &geom, int z, int buffer, bool clip) {
|
||||
if (j >= i + 4) {
|
||||
mapbox::geometry::linear_ring<long long> lr;
|
||||
|
||||
if (i != 0) {
|
||||
fprintf(f, ",");
|
||||
}
|
||||
fprintf(f, "[");
|
||||
|
||||
for (size_t k = i; k < j; k++) {
|
||||
lr.push_back(mapbox::geometry::point<long long>(geom[k].x, geom[k].y));
|
||||
if (k != i) {
|
||||
fprintf(f, ",");
|
||||
}
|
||||
fprintf(f, "[%lld,%lld]", geom[k].x, geom[k].y);
|
||||
lr.push_back(mapbox::geometry::point<long long>(geom[k].x * scale, geom[k].y * scale));
|
||||
}
|
||||
|
||||
fprintf(f, "]");
|
||||
|
||||
if (lr.size() >= 3) {
|
||||
wagyu.add_ring(lr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -325,16 +291,94 @@ drawvec clean_or_clip_poly(drawvec &geom, int z, int buffer, bool clip) {
|
||||
}
|
||||
}
|
||||
|
||||
fprintf(f, "]");
|
||||
fprintf(f, "\n\n\n\n\n");
|
||||
if (clip) {
|
||||
long long area = 0xFFFFFFFF;
|
||||
if (z != 0) {
|
||||
area = 1LL << (32 - z);
|
||||
}
|
||||
long long clip_buffer = buffer * area / 256;
|
||||
|
||||
fclose(f);
|
||||
fprintf(stderr, "Internal error: Polygon cleaning failed. Log in /tmp/wagyu.log\n");
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
mapbox::geometry::linear_ring<long long> lr;
|
||||
|
||||
lr.push_back(mapbox::geometry::point<long long>(scale * -clip_buffer, scale * -clip_buffer));
|
||||
lr.push_back(mapbox::geometry::point<long long>(scale * -clip_buffer, scale * (area + clip_buffer)));
|
||||
lr.push_back(mapbox::geometry::point<long long>(scale * (area + clip_buffer), scale * (area + clip_buffer)));
|
||||
lr.push_back(mapbox::geometry::point<long long>(scale * (area + clip_buffer), scale * -clip_buffer));
|
||||
lr.push_back(mapbox::geometry::point<long long>(scale * -clip_buffer, scale * -clip_buffer));
|
||||
|
||||
wagyu.add_ring(lr, mapbox::geometry::wagyu::polygon_type_clip);
|
||||
}
|
||||
|
||||
try {
|
||||
result.clear();
|
||||
wagyu.execute(mapbox::geometry::wagyu::clip_type_union, result, mapbox::geometry::wagyu::fill_type_positive, mapbox::geometry::wagyu::fill_type_positive);
|
||||
} catch (std::runtime_error &e) {
|
||||
FILE *f = fopen("/tmp/wagyu.log", "w");
|
||||
fprintf(f, "%s\n", e.what());
|
||||
fprintf(stderr, "%s\n", e.what());
|
||||
fprintf(f, "[");
|
||||
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (geom[i].op == VT_MOVETO) {
|
||||
size_t j;
|
||||
for (j = i + 1; j < geom.size(); j++) {
|
||||
if (geom[j].op != VT_LINETO) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (j >= i + 4) {
|
||||
mapbox::geometry::linear_ring<long long> lr;
|
||||
|
||||
if (i != 0) {
|
||||
fprintf(f, ",");
|
||||
}
|
||||
fprintf(f, "[");
|
||||
|
||||
for (size_t k = i; k < j; k++) {
|
||||
lr.push_back(mapbox::geometry::point<long long>(geom[k].x, geom[k].y));
|
||||
if (k != i) {
|
||||
fprintf(f, ",");
|
||||
}
|
||||
fprintf(f, "[%lld,%lld]", geom[k].x, geom[k].y);
|
||||
}
|
||||
|
||||
fprintf(f, "]");
|
||||
|
||||
if (lr.size() >= 3) {
|
||||
}
|
||||
}
|
||||
|
||||
i = j - 1;
|
||||
}
|
||||
}
|
||||
|
||||
fprintf(f, "]");
|
||||
fprintf(f, "\n\n\n\n\n");
|
||||
|
||||
fclose(f);
|
||||
fprintf(stderr, "Internal error: Polygon cleaning failed. Log in /tmp/wagyu.log\n");
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
if (scale != 1) {
|
||||
for (auto const &outer : result) {
|
||||
for (auto const &ring : outer) {
|
||||
for (auto const &p : ring) {
|
||||
if (p.x / scale != std::round(p.x / scale) ||
|
||||
p.y / scale != std::round(p.y / scale)) {
|
||||
scale = 1;
|
||||
again = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
drawvec ret;
|
||||
decode_clipped(result, ret);
|
||||
decode_clipped(result, ret, scale);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -366,11 +410,14 @@ drawvec from_tile_scale(drawvec const &geom, int z, int detail) {
|
||||
drawvec remove_noop(drawvec geom, int type, int shift) {
|
||||
// first pass: remove empty linetos
|
||||
|
||||
long long x = 0, y = 0;
|
||||
long long ox = 0, oy = 0;
|
||||
drawvec out;
|
||||
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (geom[i].op == VT_LINETO && (long long) std::round((double) geom[i].x / (1LL << shift)) == x && (long long) std::round((double) geom[i].y / (1LL << shift)) == y) {
|
||||
long long nx = std::round((double) geom[i].x / (1LL << shift));
|
||||
long long ny = std::round((double) geom[i].y / (1LL << shift));
|
||||
|
||||
if (geom[i].op == VT_LINETO && nx == ox && ny == oy) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -378,8 +425,8 @@ drawvec remove_noop(drawvec geom, int type, int shift) {
|
||||
out.push_back(geom[i]);
|
||||
} else { /* moveto or lineto */
|
||||
out.push_back(geom[i]);
|
||||
x = std::round((double) geom[i].x / (1LL << shift));
|
||||
y = std::round((double) geom[i].y / (1LL << shift));
|
||||
ox = nx;
|
||||
oy = ny;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -392,14 +439,17 @@ drawvec remove_noop(drawvec geom, int type, int shift) {
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (geom[i].op == VT_MOVETO) {
|
||||
if (i + 1 >= geom.size()) {
|
||||
// followed by end-of-geometry: not needed
|
||||
continue;
|
||||
}
|
||||
|
||||
if (geom[i + 1].op == VT_MOVETO) {
|
||||
// followed by another moveto: not needed
|
||||
continue;
|
||||
}
|
||||
|
||||
if (geom[i + 1].op == VT_CLOSEPATH) {
|
||||
// followed by closepath: not possible
|
||||
fprintf(stderr, "Shouldn't happen\n");
|
||||
i++; // also remove unused closepath
|
||||
continue;
|
||||
@@ -417,8 +467,10 @@ drawvec remove_noop(drawvec geom, int type, int shift) {
|
||||
out.resize(0);
|
||||
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (geom[i].op == VT_MOVETO) {
|
||||
if (i > 0 && geom[i - 1].op == VT_LINETO && (long long) std::round((double) geom[i - 1].x / (1LL << shift)) == (long long) std::round((double) geom[i].x / (1LL << shift)) && (long long) std::round((double) geom[i - 1].y / (1LL << shift)) == (long long) std::round((double) geom[i].y / (1LL << shift))) {
|
||||
if (i > 1 && geom[i].op == VT_MOVETO) {
|
||||
if (geom[i - 1].op == VT_LINETO &&
|
||||
std::round((double) geom[i - 1].x / (1LL << shift)) == std::round((double) geom[i].x / (1LL << shift)) &&
|
||||
std::round((double) geom[i - 1].y / (1LL << shift)) == std::round((double) geom[i].y / (1LL << shift))) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -565,3 +617,456 @@ drawvec close_poly(drawvec &geom) {
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
static bool inside(std::pair<double, double> d, int edge, long long minx, long long miny, long long maxx, long long maxy) {
|
||||
switch (edge) {
|
||||
case 0: // top
|
||||
return d.second > miny;
|
||||
|
||||
case 1: // right
|
||||
return d.first < maxx;
|
||||
|
||||
case 2: // bottom
|
||||
return d.second < maxy;
|
||||
|
||||
case 3: // left
|
||||
return d.first > minx;
|
||||
}
|
||||
|
||||
fprintf(stderr, "internal error inside\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
static std::pair<double, double> intersect(std::pair<double, double> a, std::pair<double, double> b, int edge, long long minx, long long miny, long long maxx, long long maxy) {
|
||||
switch (edge) {
|
||||
case 0: // top
|
||||
return std::pair<double, double>((a.first + (double) (b.first - a.first) * (miny - a.second) / (b.second - a.second)), miny);
|
||||
|
||||
case 1: // right
|
||||
return std::pair<double, double>(maxx, (a.second + (double) (b.second - a.second) * (maxx - a.first) / (b.first - a.first)));
|
||||
|
||||
case 2: // bottom
|
||||
return std::pair<double, double>((a.first + (double) (b.first - a.first) * (maxy - a.second) / (b.second - a.second)), maxy);
|
||||
|
||||
case 3: // left
|
||||
return std::pair<double, double>(minx, (a.second + (double) (b.second - a.second) * (minx - a.first) / (b.first - a.first)));
|
||||
}
|
||||
|
||||
fprintf(stderr, "internal error intersecting\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
// http://en.wikipedia.org/wiki/Sutherland%E2%80%93Hodgman_algorithm
|
||||
static std::vector<std::pair<double, double>> clip_poly1(std::vector<std::pair<double, double>> &geom,
|
||||
long long minx, long long miny, long long maxx, long long maxy,
|
||||
long long ax, long long ay, long long bx, long long by, drawvec &edge_nodes,
|
||||
bool prevent_simplify_shared_nodes) {
|
||||
std::vector<std::pair<double, double>> out = geom;
|
||||
|
||||
for (int edge = 0; edge < 4; edge++) {
|
||||
if (out.size() > 0) {
|
||||
std::vector<std::pair<double, double>> in = out;
|
||||
out.resize(0);
|
||||
|
||||
std::pair<double, double> S = in[in.size() - 1];
|
||||
|
||||
for (size_t e = 0; e < in.size(); e++) {
|
||||
std::pair<double, double> E = in[e];
|
||||
|
||||
if (!inside(S, edge, minx, miny, maxx, maxy)) {
|
||||
// was outside the buffer
|
||||
|
||||
if (!inside(E, edge, minx, miny, maxx, maxy)) {
|
||||
// still outside the buffer
|
||||
} else if (!inside(E, edge, ax, ay, bx, by)) {
|
||||
// outside the tile but inside the buffer
|
||||
out.push_back(intersect(S, E, edge, minx, miny, maxx, maxy)); // on buffer edge
|
||||
out.push_back(E);
|
||||
} else {
|
||||
out.push_back(intersect(S, E, edge, minx, miny, maxx, maxy)); // on buffer edge
|
||||
if (prevent_simplify_shared_nodes) {
|
||||
out.push_back(intersect(S, E, edge, ax, ay, bx, by)); // on tile boundary
|
||||
edge_nodes.push_back(draw(VT_MOVETO, std::round(out.back().first), std::round(out.back().second)));
|
||||
}
|
||||
out.push_back(E);
|
||||
}
|
||||
} else if (!inside(S, edge, ax, ay, bx, by)) {
|
||||
// was inside the buffer but outside the tile edge
|
||||
|
||||
if (!inside(E, edge, minx, miny, maxx, maxy)) {
|
||||
// now outside the buffer
|
||||
out.push_back(intersect(S, E, edge, minx, miny, maxx, maxy)); // on buffer edge
|
||||
} else if (!inside(E, edge, ax, ay, bx, by)) {
|
||||
// still outside the tile edge but inside the buffer
|
||||
out.push_back(E);
|
||||
} else {
|
||||
// now inside the tile
|
||||
if (prevent_simplify_shared_nodes) {
|
||||
out.push_back(intersect(S, E, edge, ax, ay, bx, by)); // on tile boundary
|
||||
edge_nodes.push_back(draw(VT_MOVETO, std::round(out.back().first), std::round(out.back().second)));
|
||||
}
|
||||
out.push_back(E);
|
||||
}
|
||||
} else {
|
||||
// was inside the tile
|
||||
|
||||
if (!inside(E, edge, minx, miny, maxx, maxy)) {
|
||||
// now outside the buffer
|
||||
if (prevent_simplify_shared_nodes) {
|
||||
out.push_back(intersect(S, E, edge, ax, ay, bx, by)); // on tile boundary
|
||||
edge_nodes.push_back(draw(VT_MOVETO, std::round(out.back().first), std::round(out.back().second)));
|
||||
}
|
||||
out.push_back(intersect(S, E, edge, minx, miny, maxx, maxy)); // on buffer edge
|
||||
} else if (!inside(E, edge, ax, ay, bx, by)) {
|
||||
// now inside the buffer but outside the tile edge
|
||||
if (prevent_simplify_shared_nodes) {
|
||||
out.push_back(intersect(S, E, edge, ax, ay, bx, by)); // on tile boundary
|
||||
edge_nodes.push_back(draw(VT_MOVETO, std::round(out.back().first), std::round(out.back().second)));
|
||||
}
|
||||
out.push_back(E);
|
||||
} else {
|
||||
// still inside the tile
|
||||
out.push_back(E);
|
||||
}
|
||||
}
|
||||
|
||||
S = E;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (out.size() > 0) {
|
||||
// If the polygon begins and ends outside the edge,
|
||||
// the starting and ending points will be left as the
|
||||
// places where it intersects the edge. Need to add
|
||||
// another point to close the loop.
|
||||
|
||||
if (out[0].first != out[out.size() - 1].first || out[0].second != out[out.size() - 1].second) {
|
||||
out.push_back(out[0]);
|
||||
}
|
||||
|
||||
if (out.size() < 3) {
|
||||
// fprintf(stderr, "Polygon degenerated to a line segment\n");
|
||||
out.clear();
|
||||
return out;
|
||||
}
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
std::string overzoom(const std::string &s, int oz, int ox, int oy, int nz, int nx, int ny,
|
||||
int detail, int buffer, std::set<std::string> const &keep, bool do_compress,
|
||||
std::vector<std::pair<unsigned, unsigned>> *next_overzoomed_tiles,
|
||||
bool demultiply, json_object *filter, bool preserve_input_order, std::unordered_map<std::string, attribute_op> const &attribute_accum, std::vector<std::string> const &unidecode_data) {
|
||||
mvt_tile tile;
|
||||
|
||||
try {
|
||||
bool was_compressed;
|
||||
if (!tile.decode(s, was_compressed)) {
|
||||
fprintf(stderr, "Couldn't parse tile %d/%u/%u\n", oz, ox, oy);
|
||||
exit(EXIT_MVT);
|
||||
}
|
||||
} catch (std::exception const &e) {
|
||||
fprintf(stderr, "PBF decoding error in tile %d/%u/%u\n", oz, ox, oy);
|
||||
exit(EXIT_PROTOBUF);
|
||||
}
|
||||
|
||||
return overzoom(tile, oz, ox, oy, nz, nx, ny, detail, buffer, keep, do_compress, next_overzoomed_tiles, demultiply, filter, preserve_input_order, attribute_accum, unidecode_data);
|
||||
}
|
||||
|
||||
struct tile_feature {
|
||||
drawvec geom;
|
||||
int t;
|
||||
bool has_id;
|
||||
unsigned long long id;
|
||||
std::vector<unsigned> tags;
|
||||
mvt_layer const *layer;
|
||||
size_t seq = 0;
|
||||
};
|
||||
|
||||
static void feature_out(std::vector<tile_feature> const &features, mvt_layer &outlayer, std::set<std::string> const &keep, std::unordered_map<std::string, attribute_op> const &attribute_accum, std::shared_ptr<std::string> const &tile_stringpool) {
|
||||
// Add geometry to output feature
|
||||
|
||||
mvt_feature outfeature;
|
||||
outfeature.type = features[0].t;
|
||||
for (auto const &g : features[0].geom) {
|
||||
outfeature.geometry.emplace_back(g.op, g.x, g.y);
|
||||
}
|
||||
|
||||
// ID and attributes, if it didn't get clipped away
|
||||
|
||||
if (outfeature.geometry.size() > 0) {
|
||||
if (features[0].has_id) {
|
||||
outfeature.has_id = true;
|
||||
outfeature.id = features[0].id;
|
||||
}
|
||||
|
||||
outfeature.seq = features[0].seq;
|
||||
|
||||
if (attribute_accum.size() > 0) {
|
||||
// convert the attributes of the output feature
|
||||
// from mvt_value to serial_val so they can have
|
||||
// attributes from the other features of the
|
||||
// multiplier cluster accumulated onto them
|
||||
|
||||
std::unordered_map<std::string, accum_state> attribute_accum_state;
|
||||
std::vector<std::string> full_keys;
|
||||
std::vector<serial_val> full_values;
|
||||
|
||||
for (size_t i = 0; i + 1 < features[0].tags.size(); i += 2) {
|
||||
auto f = attribute_accum.find(features[0].layer->keys[features[0].tags[i]]);
|
||||
if (f != attribute_accum.end()) {
|
||||
// this attribute has an accumulator, so convert it
|
||||
full_keys.push_back(features[0].layer->keys[features[0].tags[i]]);
|
||||
full_values.push_back(mvt_value_to_serial_val(features[0].layer->values[features[0].tags[i + 1]]));
|
||||
} else {
|
||||
// otherwise just tag it directly onto the output feature
|
||||
if (keep.size() == 0 || keep.find(features[0].layer->keys[features[0].tags[i]]) != keep.end()) {
|
||||
outlayer.tag(outfeature, features[0].layer->keys[features[0].tags[i]], features[0].layer->values[features[0].tags[i + 1]]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// accumulate whatever attributes are specified to be accumulated
|
||||
// onto the feature that will survive into the output, from the
|
||||
// features that will not
|
||||
|
||||
for (size_t i = 1; i < features.size(); i++) {
|
||||
for (size_t j = 0; j + 1 < features[i].tags.size(); j += 2) {
|
||||
std::string key = features[i].layer->keys[features[i].tags[j]];
|
||||
|
||||
auto f = attribute_accum.find(key);
|
||||
if (f != attribute_accum.end()) {
|
||||
serial_val val = mvt_value_to_serial_val(features[i].layer->values[features[i].tags[j + 1]]);
|
||||
preserve_attribute(f->second, key, val, full_keys, full_values, attribute_accum_state);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// convert the final attributes back to mvt_value
|
||||
// and tag them onto the output feature
|
||||
|
||||
for (size_t i = 0; i < full_keys.size(); i++) {
|
||||
if (keep.size() == 0 || keep.find(full_keys[i]) != keep.end()) {
|
||||
outlayer.tag(outfeature, full_keys[i], stringified_to_mvt_value(full_values[i].type, full_values[i].s.c_str(), tile_stringpool));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (size_t i = 0; i + 1 < features[0].tags.size(); i += 2) {
|
||||
if (keep.size() == 0 || keep.find(features[0].layer->keys[features[0].tags[i]]) != keep.end()) {
|
||||
outlayer.tag(outfeature, features[0].layer->keys[features[0].tags[i]], features[0].layer->values[features[0].tags[i + 1]]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
outlayer.features.push_back(std::move(outfeature));
|
||||
}
|
||||
}
|
||||
|
||||
static struct preservecmp {
|
||||
bool operator()(const mvt_feature &a, const mvt_feature &b) {
|
||||
return a.seq < b.seq;
|
||||
}
|
||||
} preservecmp;
|
||||
|
||||
std::string overzoom(const mvt_tile &tile, int oz, int ox, int oy, int nz, int nx, int ny,
|
||||
int detail, int buffer, std::set<std::string> const &keep, bool do_compress,
|
||||
std::vector<std::pair<unsigned, unsigned>> *next_overzoomed_tiles,
|
||||
bool demultiply, json_object *filter, bool preserve_input_order, std::unordered_map<std::string, attribute_op> const &attribute_accum, std::vector<std::string> const &unidecode_data) {
|
||||
mvt_tile outtile;
|
||||
std::shared_ptr<std::string> tile_stringpool = std::make_shared<std::string>();
|
||||
|
||||
for (auto const &layer : tile.layers) {
|
||||
mvt_layer outlayer = mvt_layer();
|
||||
|
||||
int det = detail;
|
||||
if (det <= 0) {
|
||||
det = std::round(log(layer.extent) / log(2));
|
||||
}
|
||||
|
||||
outlayer.name = layer.name;
|
||||
outlayer.version = layer.version;
|
||||
outlayer.extent = 1LL << det;
|
||||
|
||||
std::vector<tile_feature> pending_tile_features;
|
||||
|
||||
static const std::string retain_points_multiplier_first = "tippecanoe:retain_points_multiplier_first";
|
||||
static const std::string retain_points_multiplier_sequence = "tippecanoe:retain_points_multiplier_sequence";
|
||||
|
||||
for (auto feature : layer.features) {
|
||||
bool flush_multiplier_cluster = false;
|
||||
if (demultiply) {
|
||||
for (ssize_t i = feature.tags.size() - 2; i >= 0; i -= 2) {
|
||||
if (layer.keys[feature.tags[i]] == retain_points_multiplier_first) {
|
||||
mvt_value v = layer.values[feature.tags[i + 1]];
|
||||
if (v.type == mvt_bool && v.numeric_value.bool_value) {
|
||||
flush_multiplier_cluster = true;
|
||||
feature.tags.erase(feature.tags.begin() + i, feature.tags.begin() + i + 2);
|
||||
}
|
||||
} else if (i < (ssize_t) feature.tags.size() && layer.keys[feature.tags[i]] == retain_points_multiplier_sequence) {
|
||||
mvt_value v = layer.values[feature.tags[i + 1]];
|
||||
feature.seq = mvt_value_to_long_long(v);
|
||||
feature.tags.erase(feature.tags.begin() + i, feature.tags.begin() + i + 2);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
flush_multiplier_cluster = true;
|
||||
}
|
||||
|
||||
if (flush_multiplier_cluster) {
|
||||
if (pending_tile_features.size() > 0) {
|
||||
feature_out(pending_tile_features, outlayer, keep, attribute_accum, tile_stringpool);
|
||||
pending_tile_features.clear();
|
||||
}
|
||||
}
|
||||
|
||||
std::set<std::string> exclude_attributes;
|
||||
if (filter != NULL && !evaluate(feature, layer, filter, exclude_attributes, nz, unidecode_data)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
drawvec geom;
|
||||
int t = feature.type;
|
||||
|
||||
// Convert feature geometry to world coordinates
|
||||
|
||||
long long tilesize = 1LL << (32 - oz); // source tile size in world coordinates
|
||||
draw ring_closure(0, 0, 0);
|
||||
bool sametile = (nz == oz && nx == ox && ny == oy && outlayer.extent >= layer.extent);
|
||||
|
||||
for (auto const &g : feature.geometry) {
|
||||
if (g.op == mvt_closepath) {
|
||||
geom.push_back(ring_closure);
|
||||
} else {
|
||||
geom.emplace_back(g.op,
|
||||
g.x * tilesize / layer.extent + ox * tilesize,
|
||||
g.y * tilesize / layer.extent + oy * tilesize);
|
||||
|
||||
if (g.op == mvt_moveto) {
|
||||
ring_closure = geom.back();
|
||||
ring_closure.op = mvt_lineto;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Now offset from world coordinates to output tile coordinates,
|
||||
// but retain world scale, because that is what tippecanoe clipping expects
|
||||
|
||||
long long outtilesize = 1LL << (32 - nz); // destination tile size in world coordinates
|
||||
for (auto &g : geom) {
|
||||
g.x -= nx * outtilesize;
|
||||
g.y -= ny * outtilesize;
|
||||
}
|
||||
|
||||
if (!sametile) {
|
||||
// Clip to output tile
|
||||
|
||||
long long xmin = LLONG_MAX;
|
||||
long long ymin = LLONG_MAX;
|
||||
long long xmax = LLONG_MIN;
|
||||
long long ymax = LLONG_MIN;
|
||||
|
||||
for (auto const &g : geom) {
|
||||
xmin = std::min(xmin, g.x);
|
||||
ymin = std::min(ymin, g.y);
|
||||
xmax = std::max(xmax, g.x);
|
||||
ymax = std::max(ymax, g.y);
|
||||
}
|
||||
|
||||
long long b = outtilesize * buffer / 256;
|
||||
if (xmax < -b || ymax < -b || xmin > outtilesize + b || ymin > outtilesize + b) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (t == VT_LINE) {
|
||||
geom = clip_lines(geom, nz, buffer);
|
||||
} else if (t == VT_POLYGON) {
|
||||
drawvec dv;
|
||||
geom = simple_clip_poly(geom, nz, buffer, dv, false);
|
||||
} else if (t == VT_POINT) {
|
||||
geom = clip_point(geom, nz, buffer);
|
||||
}
|
||||
}
|
||||
|
||||
// Scale to output tile extent
|
||||
|
||||
to_tile_scale(geom, nz, det);
|
||||
|
||||
if (!sametile) {
|
||||
// Clean geometries
|
||||
|
||||
geom = remove_noop(geom, t, 0);
|
||||
if (t == VT_POLYGON) {
|
||||
geom = clean_or_clip_poly(geom, 0, 0, false, false);
|
||||
}
|
||||
}
|
||||
|
||||
if (t == VT_POLYGON) {
|
||||
geom = close_poly(geom);
|
||||
}
|
||||
|
||||
tile_feature tf;
|
||||
tf.geom = std::move(geom);
|
||||
tf.t = t;
|
||||
tf.has_id = feature.has_id;
|
||||
tf.id = feature.id;
|
||||
tf.tags = std::move(feature.tags);
|
||||
tf.layer = &layer;
|
||||
tf.seq = feature.seq;
|
||||
|
||||
pending_tile_features.push_back(tf);
|
||||
}
|
||||
|
||||
if (pending_tile_features.size() > 0) {
|
||||
feature_out(pending_tile_features, outlayer, keep, attribute_accum, tile_stringpool);
|
||||
pending_tile_features.clear();
|
||||
}
|
||||
|
||||
if (preserve_input_order) {
|
||||
std::stable_sort(outlayer.features.begin(), outlayer.features.end(), preservecmp);
|
||||
}
|
||||
|
||||
if (outlayer.features.size() > 0) {
|
||||
outtile.layers.push_back(std::move(outlayer));
|
||||
}
|
||||
}
|
||||
|
||||
if (next_overzoomed_tiles != NULL) {
|
||||
// will any child tiles have features in them?
|
||||
// find out recursively from the tile we just made.
|
||||
//
|
||||
// (yes, we should keep them instead of remaking them
|
||||
// later, but that first requires figuring out where to
|
||||
// keep them.)
|
||||
|
||||
if (outtile.layers.size() > 0) {
|
||||
for (size_t x = 0; x < 2; x++) {
|
||||
for (size_t y = 0; y < 2; y++) {
|
||||
std::string child = overzoom(outtile, nz, nx, ny,
|
||||
nz + 1, nx * 2 + x, ny * 2 + y,
|
||||
detail, buffer, keep, false, NULL,
|
||||
demultiply, filter, preserve_input_order, attribute_accum, unidecode_data);
|
||||
if (child.size() > 0) {
|
||||
next_overzoomed_tiles->emplace_back(nx * 2 + x, ny * 2 + y);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (outtile.layers.size() > 0) {
|
||||
std::string pbf = outtile.encode();
|
||||
|
||||
std::string compressed;
|
||||
if (do_compress) {
|
||||
compress(pbf, compressed, true);
|
||||
} else {
|
||||
compressed = pbf;
|
||||
}
|
||||
|
||||
return compressed;
|
||||
} else {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -277,7 +277,7 @@ void decode(char *fname, int z, unsigned x, unsigned y, std::set<std::string> co
|
||||
struct stat st;
|
||||
std::vector<zxy> tiles;
|
||||
|
||||
char *pmtiles_map;
|
||||
char *pmtiles_map = NULL;
|
||||
std::vector<pmtiles::entry_zxy> entries;
|
||||
bool is_pmtiles = false;
|
||||
|
||||
|
||||
+4
-1
@@ -176,7 +176,7 @@ std::vector<zxy> enumerate_dirtiles(const char *fname, int minzoom, int maxzoom)
|
||||
closedir(d1);
|
||||
}
|
||||
|
||||
std::sort(tiles.begin(), tiles.end());
|
||||
std::stable_sort(tiles.begin(), tiles.end());
|
||||
return tiles;
|
||||
}
|
||||
|
||||
@@ -318,6 +318,9 @@ void dir_write_metadata(const char *outdir, const metadata &m) {
|
||||
if (m.strategies_json.size() > 0) {
|
||||
out(state, "strategies", m.strategies_json);
|
||||
}
|
||||
if (m.decisions_json.size() > 0) {
|
||||
out(state, "tippecanoe_decisions", m.decisions_json);
|
||||
}
|
||||
out(state, "format", m.format);
|
||||
out(state, "generator", m.generator);
|
||||
out(state, "generator_options", m.generator_options);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <sys/stat.h>
|
||||
#include "mbtiles.hpp"
|
||||
|
||||
#ifndef DIRTILES_HPP
|
||||
#define DIRTILES_HPP
|
||||
|
||||
+478
-41
@@ -1,39 +1,217 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <map>
|
||||
#include <unordered_map>
|
||||
#include <functional>
|
||||
#include "mvt.hpp"
|
||||
#include "evaluator.hpp"
|
||||
#include "errors.hpp"
|
||||
#include "milo/dtoa_milo.h"
|
||||
#include "text.hpp"
|
||||
|
||||
int compare(mvt_value one, json_object *two, bool &fail) {
|
||||
if (one.type == mvt_string) {
|
||||
static std::string mvt_value_to_string(mvt_value const &one, bool &fail, std::vector<std::string> const &unidecode_data) {
|
||||
switch (one.type) {
|
||||
case mvt_string:
|
||||
if (unidecode_data.size() > 0) {
|
||||
return unidecode_smash(unidecode_data, one.c_str());
|
||||
} else {
|
||||
return one.get_string_value();
|
||||
}
|
||||
case mvt_float:
|
||||
return milo::dtoa_milo(one.numeric_value.float_value);
|
||||
case mvt_double:
|
||||
return milo::dtoa_milo(one.numeric_value.double_value);
|
||||
case mvt_int:
|
||||
return std::to_string(one.numeric_value.int_value);
|
||||
case mvt_uint:
|
||||
return std::to_string(one.numeric_value.uint_value);
|
||||
case mvt_sint:
|
||||
return std::to_string(one.numeric_value.sint_value);
|
||||
case mvt_bool:
|
||||
return one.numeric_value.bool_value ? "true" : "false";
|
||||
case mvt_null:
|
||||
fail = true; // null op string => null
|
||||
return "";
|
||||
case mvt_no_such_key:
|
||||
default:
|
||||
fprintf(stderr, "unhandled mvt_type %d\n", one.type);
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
}
|
||||
|
||||
// Alter the JSON parse tree in place to replace the original match string
|
||||
// with its unidecode-smashed version.
|
||||
//
|
||||
// To avoid repeated re-smashings of the same JSON object, objects that have
|
||||
// already been smashed are marked by setting their refcon to the unidecode data.
|
||||
static void smash(std::vector<std::string> const &unidecode_data, json_object *j) {
|
||||
if (j->value.string.refcon == (void *) &unidecode_data) {
|
||||
return;
|
||||
}
|
||||
|
||||
std::string s = unidecode_smash(unidecode_data, j->value.string.string);
|
||||
j->value.string.string = (char *) realloc(j->value.string.string, s.size() + 1);
|
||||
if (j->value.string.string == NULL) {
|
||||
perror("realloc for unidecode_smash");
|
||||
exit(EXIT_MEMORY);
|
||||
}
|
||||
strcpy(j->value.string.string, s.c_str());
|
||||
j->value.string.refcon = (void *) &unidecode_data;
|
||||
}
|
||||
|
||||
int compare_fsl(mvt_value const &one, json_object *two, bool &fail, std::vector<std::string> const &unidecode_data) {
|
||||
// In FSL expressions, the attribute value is coerced to the type
|
||||
// of the JSON literal value it is being compared to.
|
||||
//
|
||||
// If it cannot be converted, the comparison returns null
|
||||
// (which is distinct from true and false but is falsy if
|
||||
// it is the final output value).
|
||||
|
||||
if (two->type == JSON_NULL) {
|
||||
fail = true; // anything op null => null
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (two->type == JSON_NUMBER) {
|
||||
double lhs;
|
||||
|
||||
switch (one.type) {
|
||||
case mvt_string: {
|
||||
char *endptr = NULL;
|
||||
const char *s = one.c_str();
|
||||
lhs = strtod(s, &endptr);
|
||||
if (endptr == s) {
|
||||
fail = true; // non-numeric-string op number => null
|
||||
return 0;
|
||||
}
|
||||
} break;
|
||||
case mvt_float:
|
||||
lhs = one.numeric_value.float_value;
|
||||
break;
|
||||
case mvt_double:
|
||||
lhs = one.numeric_value.double_value;
|
||||
break;
|
||||
case mvt_int:
|
||||
lhs = one.numeric_value.int_value;
|
||||
break;
|
||||
case mvt_uint:
|
||||
lhs = one.numeric_value.uint_value;
|
||||
break;
|
||||
case mvt_sint:
|
||||
lhs = one.numeric_value.sint_value;
|
||||
break;
|
||||
case mvt_bool:
|
||||
lhs = one.numeric_value.bool_value;
|
||||
break;
|
||||
case mvt_null:
|
||||
fail = true; // null op number => null
|
||||
return 0;
|
||||
default:
|
||||
fprintf(stderr, "unhandled mvt_type %d\n", one.type);
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
if (lhs < two->value.number.number) {
|
||||
return -1;
|
||||
} else if (lhs > two->value.number.number) {
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (two->type == JSON_STRING) {
|
||||
std::string lhs = mvt_value_to_string(one, fail, unidecode_data);
|
||||
|
||||
if (unidecode_data.size() > 0) {
|
||||
smash(unidecode_data, two);
|
||||
}
|
||||
|
||||
return strcmp(lhs.c_str(), two->value.string.string);
|
||||
}
|
||||
|
||||
if (two->type == JSON_TRUE || two->type == JSON_FALSE) {
|
||||
bool lhs;
|
||||
|
||||
switch (one.type) {
|
||||
case mvt_string:
|
||||
lhs = one.get_string_view().size() > 0;
|
||||
break;
|
||||
case mvt_float:
|
||||
lhs = one.numeric_value.float_value != 0;
|
||||
break;
|
||||
case mvt_double:
|
||||
lhs = one.numeric_value.double_value != 0;
|
||||
break;
|
||||
case mvt_int:
|
||||
lhs = one.numeric_value.int_value != 0;
|
||||
break;
|
||||
case mvt_uint:
|
||||
lhs = one.numeric_value.uint_value != 0;
|
||||
break;
|
||||
case mvt_sint:
|
||||
lhs = one.numeric_value.sint_value != 0;
|
||||
break;
|
||||
case mvt_bool:
|
||||
lhs = one.numeric_value.bool_value;
|
||||
break;
|
||||
case mvt_null:
|
||||
fail = true; // null op bool => null
|
||||
return 0;
|
||||
|
||||
case mvt_no_such_key:
|
||||
default:
|
||||
fprintf(stderr, "unhandled mvt_type %d\n", one.type);
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
bool rhs = two->type == JSON_TRUE;
|
||||
return lhs - rhs;
|
||||
}
|
||||
|
||||
fprintf(stderr, "unhandled JSON type %d\n", two->type);
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
int compare(mvt_value const &one, json_object *two, bool &fail) {
|
||||
switch (one.type) {
|
||||
case mvt_string:
|
||||
if (two->type != JSON_STRING) {
|
||||
fail = true;
|
||||
return false; // string vs non-string
|
||||
}
|
||||
|
||||
return strcmp(one.string_value.c_str(), two->value.string.string);
|
||||
}
|
||||
return strcmp(one.c_str(), two->value.string.string);
|
||||
|
||||
if (one.type == mvt_double || one.type == mvt_float || one.type == mvt_int || one.type == mvt_uint || one.type == mvt_sint) {
|
||||
case mvt_double:
|
||||
case mvt_float:
|
||||
case mvt_int:
|
||||
case mvt_uint:
|
||||
case mvt_sint:
|
||||
if (two->type != JSON_NUMBER) {
|
||||
fail = true;
|
||||
return false; // number vs non-number
|
||||
}
|
||||
|
||||
double v;
|
||||
if (one.type == mvt_double) {
|
||||
switch (one.type) {
|
||||
case mvt_double:
|
||||
v = one.numeric_value.double_value;
|
||||
} else if (one.type == mvt_float) {
|
||||
break;
|
||||
case mvt_float:
|
||||
v = one.numeric_value.float_value;
|
||||
} else if (one.type == mvt_int) {
|
||||
break;
|
||||
case mvt_int:
|
||||
v = one.numeric_value.int_value;
|
||||
} else if (one.type == mvt_uint) {
|
||||
break;
|
||||
case mvt_uint:
|
||||
v = one.numeric_value.uint_value;
|
||||
} else if (one.type == mvt_sint) {
|
||||
break;
|
||||
case mvt_sint:
|
||||
v = one.numeric_value.sint_value;
|
||||
} else {
|
||||
break;
|
||||
case mvt_no_such_key:
|
||||
default:
|
||||
fprintf(stderr, "Internal error: bad mvt type %d\n", one.type);
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
@@ -45,32 +223,65 @@ int compare(mvt_value one, json_object *two, bool &fail) {
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (one.type == mvt_bool) {
|
||||
case mvt_bool:
|
||||
if (two->type != JSON_TRUE && two->type != JSON_FALSE) {
|
||||
fail = true;
|
||||
return false; // bool vs non-bool
|
||||
}
|
||||
|
||||
bool b = two->type != JSON_FALSE;
|
||||
return one.numeric_value.bool_value > b;
|
||||
}
|
||||
{
|
||||
bool b = two->type != JSON_FALSE;
|
||||
return one.numeric_value.bool_value > b;
|
||||
}
|
||||
|
||||
if (one.type == mvt_null) {
|
||||
case mvt_null:
|
||||
if (two->type != JSON_NULL) {
|
||||
fail = true;
|
||||
return false; // null vs non-null
|
||||
}
|
||||
|
||||
return 0; // null equals null
|
||||
|
||||
case mvt_no_such_key:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
fprintf(stderr, "Internal error: bad mvt type %d\n", one.type);
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
bool eval(std::map<std::string, mvt_value> const &feature, json_object *f, std::set<std::string> &exclude_attributes) {
|
||||
// 0: false
|
||||
// 1: true
|
||||
// -1: incomparable (sql null), treated as false in final output
|
||||
static int eval(std::function<mvt_value(std::string const &)> feature, json_object *f, std::set<std::string> &exclude_attributes, std::vector<std::string> const &unidecode_data) {
|
||||
if (f != NULL) {
|
||||
if (f->type == JSON_TRUE) {
|
||||
return 1;
|
||||
} else if (f->type == JSON_FALSE) {
|
||||
return 0;
|
||||
} else if (f->type == JSON_NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (f->type == JSON_NUMBER) {
|
||||
if (f->value.number.number == 0) {
|
||||
return 0;
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (f->type == JSON_STRING) {
|
||||
if (f->value.string.string[0] == '\0') {
|
||||
return 0;
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (f == NULL || f->type != JSON_ARRAY) {
|
||||
fprintf(stderr, "Filter is not an array: %s\n", json_stringify(f));
|
||||
exit(EXIT_FILTER);
|
||||
@@ -81,6 +292,163 @@ bool eval(std::map<std::string, mvt_value> const &feature, json_object *f, std::
|
||||
exit(EXIT_FILTER);
|
||||
}
|
||||
|
||||
// FSL conjunctions
|
||||
if (f->value.array.length == 3 &&
|
||||
f->value.array.array[1]->type == JSON_STRING &&
|
||||
(strcmp(f->value.array.array[1]->value.string.string, "or") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "and") == 0)) {
|
||||
int lhs;
|
||||
|
||||
if (f->value.array.array[0]->type == JSON_STRING) {
|
||||
// if LHS of a boolean conjunction is a string, it is an attribute reference
|
||||
mvt_value ff = feature(std::string(f->value.array.array[0]->value.string.string));
|
||||
if (ff.type != mvt_no_such_key) {
|
||||
if (ff.type == mvt_bool) {
|
||||
lhs = ff.numeric_value.bool_value;
|
||||
} else {
|
||||
lhs = -1; // not boolean: null
|
||||
}
|
||||
} else {
|
||||
lhs = -1; // not found: null
|
||||
}
|
||||
} else {
|
||||
lhs = eval(feature, f->value.array.array[0], exclude_attributes, unidecode_data);
|
||||
}
|
||||
|
||||
int rhs = eval(feature, f->value.array.array[2], exclude_attributes, unidecode_data);
|
||||
if (lhs < 0 && rhs < 0) {
|
||||
return -1; // null op null => null
|
||||
}
|
||||
if (strcmp(f->value.array.array[1]->value.string.string, "or") == 0) {
|
||||
return (lhs > 0) || (rhs > 0);
|
||||
} else {
|
||||
return (lhs > 0) && (rhs > 0);
|
||||
}
|
||||
}
|
||||
|
||||
// FSL comparators
|
||||
if (f->value.array.length == 3 &&
|
||||
f->value.array.array[0]->type == JSON_STRING &&
|
||||
f->value.array.array[1]->type == JSON_STRING &&
|
||||
(strcmp(f->value.array.array[1]->value.string.string, "lt") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "gt") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "le") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "ge") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "eq") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "ne") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "cn") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "nc") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "in") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "ni") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "is") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "isnt") == 0 ||
|
||||
false)) {
|
||||
mvt_value lhs = feature(std::string(f->value.array.array[0]->value.string.string));
|
||||
if (lhs.type == mvt_no_such_key) {
|
||||
lhs.type = mvt_null;
|
||||
}
|
||||
|
||||
if (f->value.array.array[2]->type == JSON_NULL && strcmp(f->value.array.array[1]->value.string.string, "is") == 0) {
|
||||
return lhs.type == mvt_null; // null is null => true, anything is null => false
|
||||
}
|
||||
if (f->value.array.array[2]->type == JSON_NULL && strcmp(f->value.array.array[1]->value.string.string, "isnt") == 0) {
|
||||
return lhs.type != mvt_null; // null isnt null => false, anything isnt null => true
|
||||
}
|
||||
|
||||
bool fail = false;
|
||||
|
||||
if (f->value.array.array[2]->type == JSON_STRING &&
|
||||
(strcmp(f->value.array.array[1]->value.string.string, "cn") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "nc") == 0)) {
|
||||
if (lhs.type == mvt_null) {
|
||||
return -1; // null cn/nc anything => null
|
||||
}
|
||||
|
||||
std::string s = mvt_value_to_string(lhs, fail, unidecode_data);
|
||||
if (fail) {
|
||||
return -1; // null cn anything => false
|
||||
}
|
||||
|
||||
bool contains;
|
||||
if (unidecode_data.size() > 0) {
|
||||
smash(unidecode_data, f->value.array.array[2]);
|
||||
}
|
||||
contains = strstr(s.c_str(), f->value.array.array[2]->value.string.string);
|
||||
|
||||
if (strcmp(f->value.array.array[1]->value.string.string, "cn") == 0) {
|
||||
return contains;
|
||||
} else {
|
||||
return !contains;
|
||||
}
|
||||
}
|
||||
|
||||
if (f->value.array.array[2]->type == JSON_ARRAY &&
|
||||
(strcmp(f->value.array.array[1]->value.string.string, "in") == 0 ||
|
||||
strcmp(f->value.array.array[1]->value.string.string, "ni") == 0)) {
|
||||
// no null check here, since null can be in or not in
|
||||
|
||||
bool contains = false;
|
||||
for (size_t i = 0; i < f->value.array.array[2]->value.array.length; i++) {
|
||||
if (lhs.type == mvt_null) {
|
||||
if (f->value.array.array[2]->value.array.array[i]->type == JSON_NULL) {
|
||||
contains = true; // null is null
|
||||
break;
|
||||
} else {
|
||||
contains = false; // null isnt non-null
|
||||
}
|
||||
} else {
|
||||
fail = false;
|
||||
static std::vector<std::string> no_unidecode_data;
|
||||
int cmp = compare_fsl(lhs, f->value.array.array[2]->value.array.array[i], fail, no_unidecode_data);
|
||||
|
||||
if (fail) {
|
||||
contains = false; // non-null isnt null
|
||||
} else if (cmp == 0) {
|
||||
contains = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (strcmp(f->value.array.array[1]->value.string.string, "in") == 0) {
|
||||
return contains;
|
||||
} else {
|
||||
return !contains;
|
||||
}
|
||||
}
|
||||
|
||||
if (lhs.type == mvt_null) {
|
||||
return -1; // null compared to anything => null
|
||||
}
|
||||
|
||||
int cmp = compare_fsl(lhs, f->value.array.array[2], fail, unidecode_data);
|
||||
if (fail) {
|
||||
return -1; // null
|
||||
}
|
||||
|
||||
if (strcmp(f->value.array.array[1]->value.string.string, "eq") == 0) {
|
||||
return cmp == 0;
|
||||
}
|
||||
if (strcmp(f->value.array.array[1]->value.string.string, "ne") == 0) {
|
||||
return cmp != 0;
|
||||
}
|
||||
if (strcmp(f->value.array.array[1]->value.string.string, "gt") == 0) {
|
||||
return cmp > 0;
|
||||
}
|
||||
if (strcmp(f->value.array.array[1]->value.string.string, "ge") == 0) {
|
||||
return cmp >= 0;
|
||||
}
|
||||
if (strcmp(f->value.array.array[1]->value.string.string, "lt") == 0) {
|
||||
return cmp < 0;
|
||||
}
|
||||
if (strcmp(f->value.array.array[1]->value.string.string, "le") == 0) {
|
||||
return cmp <= 0;
|
||||
}
|
||||
|
||||
fprintf(stderr, "expression fsl comparison: can't happen %s\n", f->value.array.array[1]->value.string.string);
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
if (f->value.array.array[0]->type != JSON_STRING) {
|
||||
fprintf(stderr, "Filter operation is not a string: %s\n", json_stringify(f));
|
||||
exit(EXIT_FILTER);
|
||||
@@ -98,7 +466,7 @@ bool eval(std::map<std::string, mvt_value> const &feature, json_object *f, std::
|
||||
fprintf(stderr, "\"has\" key is not a string: %s\n", json_stringify(f));
|
||||
exit(EXIT_FILTER);
|
||||
}
|
||||
return feature.count(std::string(f->value.array.array[1]->value.string.string)) != 0;
|
||||
return feature(std::string(f->value.array.array[1]->value.string.string)).type != mvt_no_such_key;
|
||||
}
|
||||
|
||||
if (strcmp(f->value.array.array[0]->value.string.string, "!has") == 0) {
|
||||
@@ -106,7 +474,7 @@ bool eval(std::map<std::string, mvt_value> const &feature, json_object *f, std::
|
||||
fprintf(stderr, "\"!has\" key is not a string: %s\n", json_stringify(f));
|
||||
exit(EXIT_FILTER);
|
||||
}
|
||||
return feature.count(std::string(f->value.array.array[1]->value.string.string)) == 0;
|
||||
return feature(std::string(f->value.array.array[1]->value.string.string)).type == mvt_no_such_key;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,8 +493,8 @@ bool eval(std::map<std::string, mvt_value> const &feature, json_object *f, std::
|
||||
exit(EXIT_FILTER);
|
||||
}
|
||||
|
||||
auto ff = feature.find(std::string(f->value.array.array[1]->value.string.string));
|
||||
if (ff == feature.end()) {
|
||||
mvt_value ff = feature(std::string(f->value.array.array[1]->value.string.string));
|
||||
if (ff.type == mvt_no_such_key) {
|
||||
static bool warned = false;
|
||||
if (!warned) {
|
||||
const char *s = json_stringify(f);
|
||||
@@ -141,7 +509,7 @@ bool eval(std::map<std::string, mvt_value> const &feature, json_object *f, std::
|
||||
}
|
||||
|
||||
bool fail = false;
|
||||
int cmp = compare(ff->second, f->value.array.array[2], fail);
|
||||
int cmp = compare(ff, f->value.array.array[2], fail);
|
||||
|
||||
if (fail) {
|
||||
static bool warned = false;
|
||||
@@ -192,17 +560,19 @@ bool eval(std::map<std::string, mvt_value> const &feature, json_object *f, std::
|
||||
}
|
||||
|
||||
for (size_t i = 1; i < f->value.array.length; i++) {
|
||||
bool out = eval(feature, f->value.array.array[i], exclude_attributes);
|
||||
int out = eval(feature, f->value.array.array[i], exclude_attributes, unidecode_data);
|
||||
|
||||
if (strcmp(f->value.array.array[0]->value.string.string, "all") == 0) {
|
||||
v = v && out;
|
||||
if (!v) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
v = v || out;
|
||||
if (v) {
|
||||
break;
|
||||
if (out >= 0) { // nulls are ignored in boolean and/or expressions
|
||||
if (strcmp(f->value.array.array[0]->value.string.string, "all") == 0) {
|
||||
v = v && out;
|
||||
if (!v) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
v = v || out;
|
||||
if (v) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -226,8 +596,8 @@ bool eval(std::map<std::string, mvt_value> const &feature, json_object *f, std::
|
||||
exit(EXIT_FILTER);
|
||||
}
|
||||
|
||||
auto ff = feature.find(std::string(f->value.array.array[1]->value.string.string));
|
||||
if (ff == feature.end()) {
|
||||
mvt_value ff = feature(std::string(f->value.array.array[1]->value.string.string));
|
||||
if (ff.type == mvt_no_such_key) {
|
||||
static bool warned = false;
|
||||
if (!warned) {
|
||||
const char *s = json_stringify(f);
|
||||
@@ -244,7 +614,7 @@ bool eval(std::map<std::string, mvt_value> const &feature, json_object *f, std::
|
||||
bool found = false;
|
||||
for (size_t i = 2; i < f->value.array.length; i++) {
|
||||
bool fail = false;
|
||||
int cmp = compare(ff->second, f->value.array.array[i], fail);
|
||||
int cmp = compare(ff, f->value.array.array[i], fail);
|
||||
|
||||
if (fail) {
|
||||
static bool warned = false;
|
||||
@@ -281,7 +651,7 @@ bool eval(std::map<std::string, mvt_value> const &feature, json_object *f, std::
|
||||
exit(EXIT_FILTER);
|
||||
}
|
||||
|
||||
bool ok = eval(feature, f->value.array.array[2], exclude_attributes);
|
||||
bool ok = eval(feature, f->value.array.array[2], exclude_attributes, unidecode_data) > 0;
|
||||
if (!ok) {
|
||||
exclude_attributes.insert(f->value.array.array[1]->value.string.string);
|
||||
}
|
||||
@@ -293,7 +663,7 @@ bool eval(std::map<std::string, mvt_value> const &feature, json_object *f, std::
|
||||
exit(EXIT_FILTER);
|
||||
}
|
||||
|
||||
bool evaluate(std::map<std::string, mvt_value> const &feature, std::string const &layer, json_object *filter, std::set<std::string> &exclude_attributes) {
|
||||
bool evaluate(std::function<mvt_value(std::string const &)> feature, std::string const &layer, json_object *filter, std::set<std::string> &exclude_attributes, std::vector<std::string> const &unidecode_data) {
|
||||
if (filter == NULL || filter->type != JSON_HASH) {
|
||||
fprintf(stderr, "Error: filter is not a hash: %s\n", json_stringify(filter));
|
||||
exit(EXIT_JSON);
|
||||
@@ -304,12 +674,12 @@ bool evaluate(std::map<std::string, mvt_value> const &feature, std::string const
|
||||
|
||||
f = json_hash_get(filter, layer.c_str());
|
||||
if (ok && f != NULL) {
|
||||
ok = eval(feature, f, exclude_attributes);
|
||||
ok = eval(feature, f, exclude_attributes, unidecode_data) > 0;
|
||||
}
|
||||
|
||||
f = json_hash_get(filter, "*");
|
||||
if (ok && f != NULL) {
|
||||
ok = eval(feature, f, exclude_attributes);
|
||||
ok = eval(feature, f, exclude_attributes, unidecode_data) > 0;
|
||||
}
|
||||
|
||||
return ok;
|
||||
@@ -346,3 +716,70 @@ json_object *parse_filter(const char *s) {
|
||||
json_end(jp);
|
||||
return filter;
|
||||
}
|
||||
|
||||
bool evaluate(std::unordered_map<std::string, mvt_value> const &feature, std::string const &layer, json_object *filter, std::set<std::string> &exclude_attributes, std::vector<std::string> const &unidecode_data) {
|
||||
std::function<mvt_value(std::string const &)> getter = [&](std::string const &key) {
|
||||
auto f = feature.find(key);
|
||||
if (f != feature.end()) {
|
||||
return f->second;
|
||||
} else {
|
||||
mvt_value v;
|
||||
v.type = mvt_no_such_key;
|
||||
v.numeric_value.null_value = 0;
|
||||
return v;
|
||||
}
|
||||
};
|
||||
|
||||
return evaluate(getter, layer, filter, exclude_attributes, unidecode_data);
|
||||
}
|
||||
|
||||
bool evaluate(mvt_feature const &feat, mvt_layer const &layer, json_object *filter, std::set<std::string> &exclude_attributes, int z, std::vector<std::string> const &unidecode_data) {
|
||||
std::function<mvt_value(std::string const &)> getter = [&](std::string const &key) {
|
||||
const static std::string dollar_id = "$id";
|
||||
if (key == dollar_id && feat.has_id) {
|
||||
mvt_value v;
|
||||
v.type = mvt_uint;
|
||||
v.numeric_value.uint_value = feat.id;
|
||||
return v;
|
||||
}
|
||||
|
||||
const static std::string dollar_type = "$type";
|
||||
if (key == dollar_type) {
|
||||
mvt_value v;
|
||||
v.type = mvt_string;
|
||||
|
||||
if (feat.type == mvt_point) {
|
||||
const static std::string point = "Point";
|
||||
v.set_string_value(point);
|
||||
} else if (feat.type == mvt_linestring) {
|
||||
const static std::string linestring = "LineString";
|
||||
v.set_string_value(linestring);
|
||||
} else if (feat.type == mvt_polygon) {
|
||||
const static std::string polygon = "Polygon";
|
||||
v.set_string_value(polygon);
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
const static std::string dollar_zoom = "$zoom";
|
||||
if (key == dollar_zoom) {
|
||||
mvt_value v2;
|
||||
v2.type = mvt_uint;
|
||||
v2.numeric_value.uint_value = z;
|
||||
return v2;
|
||||
}
|
||||
|
||||
for (size_t i = 0; i + 1 < feat.tags.size(); i += 2) {
|
||||
if (layer.keys[feat.tags[i]] == key) {
|
||||
return layer.values[feat.tags[i + 1]];
|
||||
}
|
||||
}
|
||||
|
||||
mvt_value v;
|
||||
v.type = mvt_no_such_key;
|
||||
v.numeric_value.null_value = 0;
|
||||
return v;
|
||||
};
|
||||
|
||||
return evaluate(getter, layer.name, filter, exclude_attributes, unidecode_data);
|
||||
}
|
||||
|
||||
+4
-2
@@ -1,14 +1,16 @@
|
||||
#ifndef EVALUATOR_HPP
|
||||
#define EVALUATOR HPP
|
||||
|
||||
#include <map>
|
||||
#include <unordered_map>
|
||||
#include <string>
|
||||
#include <set>
|
||||
#include "jsonpull/jsonpull.h"
|
||||
#include "mvt.hpp"
|
||||
|
||||
bool evaluate(std::map<std::string, mvt_value> const &feature, std::string const &layer, json_object *filter, std::set<std::string> &exclude_attributes);
|
||||
bool evaluate(std::unordered_map<std::string, mvt_value> const &feature, std::string const &layer, json_object *filter, std::set<std::string> &exclude_attributes, std::vector<std::string> const &unidecode_data);
|
||||
json_object *parse_filter(const char *s);
|
||||
json_object *read_filter(const char *fname);
|
||||
|
||||
bool evaluate(mvt_feature const &feat, mvt_layer const &layer, json_object *filter, std::set<std::string> &exclude_attributes, int z, std::vector<std::string> const &unidecode_data);
|
||||
|
||||
#endif
|
||||
|
||||
+6
-6
@@ -7,6 +7,7 @@
|
||||
#include "milo/dtoa_milo.h"
|
||||
#include "main.hpp"
|
||||
#include "errors.hpp"
|
||||
#include "thread.hpp"
|
||||
|
||||
static constexpr uint8_t magicbytes[8] = { 0x66, 0x67, 0x62, 0x03, 0x66, 0x67, 0x62, 0x01 };
|
||||
|
||||
@@ -131,7 +132,6 @@ void readFeature(const FlatGeobuf::Feature *feature, long long feature_sequence_
|
||||
serial_feature sf;
|
||||
|
||||
sf.layer = layer;
|
||||
sf.layername = layername;
|
||||
sf.segment = sst->segment;
|
||||
if (feature_sequence_id >= 0) {
|
||||
sf.has_id = true;
|
||||
@@ -139,8 +139,8 @@ void readFeature(const FlatGeobuf::Feature *feature, long long feature_sequence_
|
||||
sf.has_id = false;
|
||||
}
|
||||
sf.id = feature_sequence_id;
|
||||
sf.has_tippecanoe_minzoom = false;
|
||||
sf.has_tippecanoe_maxzoom = false;
|
||||
sf.tippecanoe_minzoom = -1;
|
||||
sf.tippecanoe_maxzoom = -1;
|
||||
sf.feature_minzoom = false;
|
||||
sf.seq = (*sst->layer_seq);
|
||||
sf.geometry = dv;
|
||||
@@ -246,7 +246,7 @@ void readFeature(const FlatGeobuf::Feature *feature, long long feature_sequence_
|
||||
sf.full_keys = full_keys;
|
||||
sf.full_values = full_values;
|
||||
|
||||
serialize_feature(sst, sf);
|
||||
serialize_feature(sst, sf, layername);
|
||||
}
|
||||
|
||||
struct fgb_queued_feature {
|
||||
@@ -303,7 +303,7 @@ void fgbRunQueue() {
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < CPUS; i++) {
|
||||
if (pthread_create(&pthreads[i], NULL, fgb_run_parse_feature, &qra[i]) != 0) {
|
||||
if (thread_create(&pthreads[i], NULL, fgb_run_parse_feature, &qra[i]) != 0) {
|
||||
perror("pthread_create");
|
||||
exit(EXIT_PTHREAD);
|
||||
}
|
||||
@@ -368,7 +368,7 @@ void parse_flatgeobuf(std::vector<struct serialization_state> *sst, const char *
|
||||
auto h_geometry_type = header->geometry_type();
|
||||
|
||||
long long feature_sequence_id = -1;
|
||||
int index_size = 0;
|
||||
long long index_size = 0;
|
||||
if (node_size > 0) {
|
||||
if (!quiet) {
|
||||
fprintf(stderr, "detected indexed FlatGeobuf: assigning feature IDs by sequence\n");
|
||||
|
||||
+9
-12
@@ -15,6 +15,7 @@
|
||||
#include "jsonpull/jsonpull.h"
|
||||
#include "text.hpp"
|
||||
#include "errors.hpp"
|
||||
#include "thread.hpp"
|
||||
|
||||
#define POINT 0
|
||||
#define MULTIPOINT 1
|
||||
@@ -379,12 +380,11 @@ void readFeature(protozero::pbf_reader &pbf, size_t dim, double e, std::vector<s
|
||||
serial_feature sf;
|
||||
|
||||
sf.layer = layer;
|
||||
sf.layername = layername;
|
||||
sf.segment = sst->segment;
|
||||
sf.has_id = has_id;
|
||||
sf.id = id;
|
||||
sf.has_tippecanoe_minzoom = false;
|
||||
sf.has_tippecanoe_maxzoom = false;
|
||||
sf.tippecanoe_minzoom = -1;
|
||||
sf.tippecanoe_maxzoom = -1;
|
||||
sf.feature_minzoom = false;
|
||||
sf.seq = *(sst->layer_seq);
|
||||
sf.geometry = dv[i].dv;
|
||||
@@ -400,19 +400,17 @@ void readFeature(protozero::pbf_reader &pbf, size_t dim, double e, std::vector<s
|
||||
if (o != NULL) {
|
||||
json_object *min = json_hash_get(o, "minzoom");
|
||||
if (min != NULL && (min->type == JSON_NUMBER)) {
|
||||
sf.has_tippecanoe_minzoom = true;
|
||||
sf.tippecanoe_minzoom = integer_zoom(sst->fname, milo::dtoa_milo(min->value.number.number));
|
||||
}
|
||||
|
||||
json_object *max = json_hash_get(o, "maxzoom");
|
||||
if (max != NULL && (max->type == JSON_NUMBER)) {
|
||||
sf.has_tippecanoe_maxzoom = true;
|
||||
sf.tippecanoe_maxzoom = integer_zoom(sst->fname, milo::dtoa_milo(max->value.number.number));
|
||||
}
|
||||
|
||||
json_object *tlayer = json_hash_get(o, "layer");
|
||||
if (tlayer != NULL && (tlayer->type == JSON_STRING)) {
|
||||
sf.layername = tlayer->value.string.string;
|
||||
layername = tlayer->value.string.string;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -420,7 +418,7 @@ void readFeature(protozero::pbf_reader &pbf, size_t dim, double e, std::vector<s
|
||||
json_end(jp);
|
||||
}
|
||||
|
||||
serialize_feature(sst, sf);
|
||||
serialize_feature(sst, sf, layername);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -465,7 +463,7 @@ void runQueue() {
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < CPUS; i++) {
|
||||
if (pthread_create(&pthreads[i], NULL, run_parse_feature, &qra[i]) != 0) {
|
||||
if (thread_create(&pthreads[i], NULL, run_parse_feature, &qra[i]) != 0) {
|
||||
perror("pthread_create");
|
||||
exit(EXIT_PTHREAD);
|
||||
}
|
||||
@@ -506,17 +504,16 @@ void outBareGeometry(drawvec const &dv, int type, struct serialization_state *ss
|
||||
serial_feature sf;
|
||||
|
||||
sf.layer = layer;
|
||||
sf.layername = layername;
|
||||
sf.segment = sst->segment;
|
||||
sf.has_id = false;
|
||||
sf.has_tippecanoe_minzoom = false;
|
||||
sf.has_tippecanoe_maxzoom = false;
|
||||
sf.tippecanoe_minzoom = -1;
|
||||
sf.tippecanoe_maxzoom = -1;
|
||||
sf.feature_minzoom = false;
|
||||
sf.seq = (*sst->layer_seq);
|
||||
sf.geometry = dv;
|
||||
sf.t = type;
|
||||
|
||||
serialize_feature(sst, sf);
|
||||
serialize_feature(sst, sf, layername);
|
||||
}
|
||||
|
||||
void readFeatureCollection(protozero::pbf_reader &pbf, size_t dim, double e, std::vector<std::string> &keys, std::vector<struct serialization_state> *sst, int layer, std::string layername) {
|
||||
|
||||
+3
-4
@@ -115,12 +115,11 @@ void parse_geocsv(std::vector<struct serialization_state> &sst, std::string fnam
|
||||
serial_feature sf;
|
||||
|
||||
sf.layer = layer;
|
||||
sf.layername = layername;
|
||||
sf.segment = sst[0].segment;
|
||||
sf.has_id = false;
|
||||
sf.id = 0;
|
||||
sf.has_tippecanoe_minzoom = false;
|
||||
sf.has_tippecanoe_maxzoom = false;
|
||||
sf.tippecanoe_minzoom = -1;
|
||||
sf.tippecanoe_maxzoom = -1;
|
||||
sf.feature_minzoom = false;
|
||||
sf.seq = *(sst[0].layer_seq);
|
||||
sf.geometry = dv;
|
||||
@@ -128,7 +127,7 @@ void parse_geocsv(std::vector<struct serialization_state> &sst, std::string fnam
|
||||
sf.full_keys = full_keys;
|
||||
sf.full_values = full_values;
|
||||
|
||||
serialize_feature(&sst[0], sf);
|
||||
serialize_feature(&sst[0], sf, layername);
|
||||
}
|
||||
|
||||
if (fname.size() != 0) {
|
||||
|
||||
+14
-48
@@ -10,7 +10,6 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
@@ -41,7 +40,7 @@
|
||||
#include "milo/dtoa_milo.h"
|
||||
#include "errors.hpp"
|
||||
|
||||
int serialize_geojson_feature(struct serialization_state *sst, json_object *geometry, json_object *properties, json_object *id, int layer, json_object *tippecanoe, json_object *feature, std::string layername) {
|
||||
int serialize_geojson_feature(struct serialization_state *sst, json_object *geometry, json_object *properties, json_object *id, int layer, json_object *tippecanoe, json_object *feature, std::string const &layername) {
|
||||
json_object *geometry_type = json_hash_get(geometry, "type");
|
||||
if (geometry_type == NULL) {
|
||||
static int warned = 0;
|
||||
@@ -81,7 +80,7 @@ int serialize_geojson_feature(struct serialization_state *sst, json_object *geom
|
||||
|
||||
int tippecanoe_minzoom = -1;
|
||||
int tippecanoe_maxzoom = -1;
|
||||
std::string tippecanoe_layername;
|
||||
std::string tippecanoe_layername = layername;
|
||||
|
||||
if (tippecanoe != NULL) {
|
||||
json_object *min = json_hash_get(tippecanoe, "minzoom");
|
||||
@@ -106,7 +105,8 @@ int serialize_geojson_feature(struct serialization_state *sst, json_object *geom
|
||||
if (id->type == JSON_NUMBER) {
|
||||
if (id->value.number.number >= 0) {
|
||||
char *err = NULL;
|
||||
id_value = strtoull(milo::dtoa_milo(id->value.number.number).c_str(), &err, 10);
|
||||
std::string id_number = milo::dtoa_milo(id->value.number.number);
|
||||
id_value = strtoull(id_number.c_str(), &err, 10);
|
||||
|
||||
if (id->value.number.large_unsigned != 0) {
|
||||
id_value = id->value.number.large_unsigned;
|
||||
@@ -182,36 +182,18 @@ int serialize_geojson_feature(struct serialization_state *sst, json_object *geom
|
||||
nprop = properties->value.object.length;
|
||||
}
|
||||
|
||||
std::vector<char *> metakey;
|
||||
metakey.resize(nprop);
|
||||
std::vector<std::string> keys;
|
||||
std::vector<serial_val> values;
|
||||
|
||||
std::vector<std::string> metaval;
|
||||
metaval.resize(nprop);
|
||||
|
||||
std::vector<int> metatype;
|
||||
metatype.resize(nprop);
|
||||
|
||||
size_t m = 0;
|
||||
keys.reserve(nprop);
|
||||
values.reserve(nprop);
|
||||
|
||||
for (size_t i = 0; i < nprop; i++) {
|
||||
if (properties->value.object.keys[i]->type == JSON_STRING) {
|
||||
std::string s(properties->value.object.keys[i]->value.string.string);
|
||||
serial_val sv = stringify_value(properties->value.object.values[i], sst->fname, sst->line, feature);
|
||||
|
||||
int type = -1;
|
||||
std::string val;
|
||||
stringify_value(properties->value.object.values[i], type, val, sst->fname, sst->line, feature);
|
||||
|
||||
if (type >= 0) {
|
||||
metakey[m] = properties->value.object.keys[i]->value.string.string;
|
||||
metatype[m] = type;
|
||||
metaval[m] = val;
|
||||
m++;
|
||||
} else {
|
||||
metakey[m] = properties->value.object.keys[i]->value.string.string;
|
||||
metatype[m] = mvt_null;
|
||||
metaval[m] = "null";
|
||||
m++;
|
||||
}
|
||||
keys.emplace_back(properties->value.object.keys[i]->value.string.string);
|
||||
values.push_back(std::move(sv));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -224,31 +206,15 @@ int serialize_geojson_feature(struct serialization_state *sst, json_object *geom
|
||||
sf.t = mb_geometry[t];
|
||||
sf.has_id = has_id;
|
||||
sf.id = id_value;
|
||||
sf.has_tippecanoe_minzoom = (tippecanoe_minzoom != -1);
|
||||
sf.tippecanoe_minzoom = tippecanoe_minzoom;
|
||||
sf.has_tippecanoe_maxzoom = (tippecanoe_maxzoom != -1);
|
||||
sf.tippecanoe_maxzoom = tippecanoe_maxzoom;
|
||||
sf.geometry = dv;
|
||||
sf.feature_minzoom = 0; // Will be filled in during index merging
|
||||
sf.seq = *(sst->layer_seq);
|
||||
sf.full_keys = std::move(keys);
|
||||
sf.full_values = std::move(values);
|
||||
|
||||
if (tippecanoe_layername.size() != 0) {
|
||||
sf.layername = tippecanoe_layername;
|
||||
} else {
|
||||
sf.layername = layername;
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < m; i++) {
|
||||
sf.full_keys.push_back(metakey[i]);
|
||||
|
||||
serial_val sv;
|
||||
sv.type = metatype[i];
|
||||
sv.s = metaval[i];
|
||||
|
||||
sf.full_values.push_back(sv);
|
||||
}
|
||||
|
||||
return serialize_feature(sst, sf);
|
||||
return serialize_feature(sst, sf, tippecanoe_layername);
|
||||
}
|
||||
|
||||
void check_crs(json_object *j, const char *reading) {
|
||||
|
||||
+200
-150
@@ -21,7 +21,7 @@
|
||||
#include "errors.hpp"
|
||||
#include "projection.hpp"
|
||||
|
||||
drawvec decode_geometry(char **meta, int z, unsigned tx, unsigned ty, long long *bbox, unsigned initial_x, unsigned initial_y) {
|
||||
drawvec decode_geometry(const char **meta, int z, unsigned tx, unsigned ty, long long *bbox, unsigned initial_x, unsigned initial_y) {
|
||||
drawvec out;
|
||||
|
||||
bbox[0] = LLONG_MAX;
|
||||
@@ -56,18 +56,10 @@ drawvec decode_geometry(char **meta, int z, unsigned tx, unsigned ty, long long
|
||||
wwy -= ty << (32 - z);
|
||||
}
|
||||
|
||||
if (wwx < bbox[0]) {
|
||||
bbox[0] = wwx;
|
||||
}
|
||||
if (wwy < bbox[1]) {
|
||||
bbox[1] = wwy;
|
||||
}
|
||||
if (wwx > bbox[2]) {
|
||||
bbox[2] = wwx;
|
||||
}
|
||||
if (wwy > bbox[3]) {
|
||||
bbox[3] = wwy;
|
||||
}
|
||||
bbox[0] = std::min(wwx, bbox[0]);
|
||||
bbox[1] = std::min(wwy, bbox[1]);
|
||||
bbox[2] = std::max(wwx, bbox[2]);
|
||||
bbox[3] = std::max(wwy, bbox[3]);
|
||||
|
||||
d.x = wwx;
|
||||
d.y = wwy;
|
||||
@@ -118,13 +110,13 @@ void check_polygon(drawvec &geom) {
|
||||
mapbox::geometry::linear_ring<long long> lr;
|
||||
|
||||
for (size_t k = i; k < j; k++) {
|
||||
lr.push_back(mapbox::geometry::point<long long>(geom[k].x, geom[k].y));
|
||||
lr.push_back({geom[k].x, geom[k].y});
|
||||
}
|
||||
|
||||
if (lr.size() >= 3) {
|
||||
mapbox::geometry::polygon<long long> p;
|
||||
p.push_back(lr);
|
||||
mp.push_back(p);
|
||||
p.push_back(std::move(lr));
|
||||
mp.push_back(std::move(p));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -151,10 +143,6 @@ void check_polygon(drawvec &geom) {
|
||||
|
||||
double area = get_area(geom, i, j);
|
||||
|
||||
#if 0
|
||||
fprintf(stderr, "looking at %lld to %lld, area %f\n", (long long) i, (long long) j, area);
|
||||
#endif
|
||||
|
||||
if (area > 0) {
|
||||
outer_start = i;
|
||||
outer_len = j - i;
|
||||
@@ -171,13 +159,7 @@ void check_polygon(drawvec &geom) {
|
||||
}
|
||||
|
||||
if (!on_edge) {
|
||||
printf("%lld,%lld at %lld not in outer ring (%lld to %lld)\n", geom[k].x, geom[k].y, (long long) k, (long long) outer_start, (long long) (outer_start + outer_len));
|
||||
|
||||
#if 0
|
||||
for (size_t l = outer_start; l < outer_start + outer_len; l++) {
|
||||
fprintf(stderr, " %lld,%lld", geom[l].x, geom[l].y);
|
||||
}
|
||||
#endif
|
||||
fprintf(stderr, "%lld,%lld at %lld not in outer ring (%lld to %lld)\n", geom[k].x, geom[k].y, (long long) k, (long long) outer_start, (long long) (outer_start + outer_len));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -186,14 +168,13 @@ void check_polygon(drawvec &geom) {
|
||||
}
|
||||
}
|
||||
|
||||
drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double *accum_area, serial_feature *this_feature, serial_feature *tiny_feature) {
|
||||
drawvec reduce_tiny_poly(drawvec const &geom, int z, int detail, bool *still_needs_simplification, bool *reduced_away, double *accum_area) {
|
||||
drawvec out;
|
||||
const double pixel = (1LL << (32 - detail - z)) * (double) tiny_polygon_size;
|
||||
bool includes_real = false;
|
||||
bool includes_dust = false;
|
||||
|
||||
*reduced = true;
|
||||
bool included_last_outer = false;
|
||||
*still_needs_simplification = false;
|
||||
*reduced_away = false;
|
||||
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (geom[i].op == VT_MOVETO) {
|
||||
@@ -223,18 +204,17 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
|
||||
// cut out of, so we are just subtracting its area from the tiny polygon
|
||||
// rather than trying to deal with it geometrically
|
||||
if ((area > 0 && area <= pixel * pixel) || (area < 0 && !included_last_outer)) {
|
||||
// printf("area is only %f vs %lld so using square\n", area, pixel * pixel);
|
||||
|
||||
*accum_area += area;
|
||||
*reduced_away = true;
|
||||
|
||||
if (area > 0 && *accum_area > pixel * pixel) {
|
||||
// XXX use centroid;
|
||||
|
||||
out.push_back(draw(VT_MOVETO, geom[i].x - pixel / 2, geom[i].y - pixel / 2));
|
||||
out.push_back(draw(VT_LINETO, geom[i].x - pixel / 2 + pixel, geom[i].y - pixel / 2));
|
||||
out.push_back(draw(VT_LINETO, geom[i].x - pixel / 2 + pixel, geom[i].y - pixel / 2 + pixel));
|
||||
out.push_back(draw(VT_LINETO, geom[i].x - pixel / 2, geom[i].y - pixel / 2 + pixel));
|
||||
out.push_back(draw(VT_LINETO, geom[i].x - pixel / 2, geom[i].y - pixel / 2));
|
||||
includes_dust = true;
|
||||
out.emplace_back(VT_MOVETO, geom[i].x - pixel / 2, geom[i].y - pixel / 2);
|
||||
out.emplace_back(VT_LINETO, geom[i].x - pixel / 2 + pixel, geom[i].y - pixel / 2);
|
||||
out.emplace_back(VT_LINETO, geom[i].x - pixel / 2 + pixel, geom[i].y - pixel / 2 + pixel);
|
||||
out.emplace_back(VT_LINETO, geom[i].x - pixel / 2, geom[i].y - pixel / 2 + pixel);
|
||||
out.emplace_back(VT_LINETO, geom[i].x - pixel / 2, geom[i].y - pixel / 2);
|
||||
|
||||
*accum_area -= pixel * pixel;
|
||||
}
|
||||
@@ -248,21 +228,22 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
|
||||
// as a real geometry because otherwise we can accumulate enough tiny holes
|
||||
// that we will drop the next several outer rings getting back up to 0.
|
||||
else {
|
||||
// printf("area is %f so keeping instead of %lld\n", area, pixel * pixel);
|
||||
|
||||
for (size_t k = i; k < j && k < geom.size(); k++) {
|
||||
out.push_back(geom[k]);
|
||||
}
|
||||
|
||||
// which means that the overall polygon has a real geometry,
|
||||
// which means that it gets to be simplified.
|
||||
*reduced = false;
|
||||
includes_real = true;
|
||||
*still_needs_simplification = true;
|
||||
|
||||
if (area > 0) {
|
||||
included_last_outer = true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// area is 0: doesn't count as either having been reduced away,
|
||||
// since it was probably just degenerate from having been clipped,
|
||||
// or as needing simplification, since it produces no output.
|
||||
}
|
||||
|
||||
i = j - 1;
|
||||
@@ -275,41 +256,29 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
|
||||
fprintf(stderr, "\n");
|
||||
|
||||
out.push_back(geom[i]);
|
||||
includes_real = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!includes_real) {
|
||||
if (includes_dust) {
|
||||
// this geometry is just dust, so if there is another feature that
|
||||
// contributed to the dust that is larger than this feature,
|
||||
// keep its attributes instead of this one that just happened to be
|
||||
// the one that hit the threshold of survival.
|
||||
|
||||
if (tiny_feature->extent > this_feature->extent) {
|
||||
*this_feature = *tiny_feature;
|
||||
tiny_feature->extent = 0;
|
||||
}
|
||||
} else {
|
||||
// this is a feature that we are throwing away, so hang on to it
|
||||
// attributes if it is bigger than the biggest one we threw away so far
|
||||
|
||||
if (this_feature->extent > tiny_feature->extent) {
|
||||
*tiny_feature = *this_feature;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
int quick_check(long long *bbox, int z, long long buffer) {
|
||||
int quick_check(const long long *bbox, int z, long long buffer) {
|
||||
long long min = 0;
|
||||
long long area = 1LL << (32 - z);
|
||||
|
||||
// bbox entirely within the tile proper
|
||||
if (bbox[0] > min && bbox[1] > min && bbox[2] < area && bbox[3] < area) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
min -= buffer * area / 256;
|
||||
area += buffer * area / 256;
|
||||
|
||||
// bbox entirely within the tile, including its buffer
|
||||
if (bbox[0] > min && bbox[1] > min && bbox[2] < area && bbox[3] < area) {
|
||||
return 3;
|
||||
}
|
||||
|
||||
// bbox entirely outside the tile
|
||||
if (bbox[0] > area || bbox[1] > area) {
|
||||
return 0;
|
||||
@@ -318,11 +287,6 @@ int quick_check(long long *bbox, int z, long long buffer) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// bbox entirely within the tile
|
||||
if (bbox[0] > min && bbox[1] > min && bbox[2] < area && bbox[3] < area) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
// some overlap of edge
|
||||
return 2;
|
||||
}
|
||||
@@ -336,46 +300,64 @@ bool point_within_tile(long long x, long long y, int z) {
|
||||
return x >= 0 && y >= 0 && x < area && y < area;
|
||||
}
|
||||
|
||||
static double square_distance_from_line(long long point_x, long long point_y, long long segA_x, long long segA_y, long long segB_x, long long segB_y) {
|
||||
double distance_from_line(long long point_x, long long point_y, long long segA_x, long long segA_y, long long segB_x, long long segB_y) {
|
||||
long long p2x = segB_x - segA_x;
|
||||
long long p2y = segB_y - segA_y;
|
||||
double something = p2x * p2x + p2y * p2y;
|
||||
double u = 0 == something ? 0 : ((point_x - segA_x) * p2x + (point_y - segA_y) * p2y) / something;
|
||||
|
||||
if (u > 1) {
|
||||
// These calculations must be made in integers instead of floating point
|
||||
// to make them consistent between x86 and arm floating point implementations.
|
||||
//
|
||||
// Coordinates may be up to 34 bits, so their product is up to 68 bits,
|
||||
// making their sum up to 69 bits. Downshift before multiplying to keep them in range.
|
||||
double something = ((p2x / 4) * (p2x / 8) + (p2y / 4) * (p2y / 8)) * 32.0;
|
||||
// likewise
|
||||
double u = (0 == something) ? 0 : ((point_x - segA_x) / 4 * (p2x / 8) + (point_y - segA_y) / 4 * (p2y / 8)) * 32.0 / (something);
|
||||
|
||||
if (u >= 1) {
|
||||
u = 1;
|
||||
} else if (u < 0) {
|
||||
} else if (u <= 0) {
|
||||
u = 0;
|
||||
}
|
||||
|
||||
long long x = std::round(segA_x + u * p2x);
|
||||
long long y = std::round(segA_y + u * p2y);
|
||||
double x = segA_x + u * p2x;
|
||||
double y = segA_y + u * p2y;
|
||||
|
||||
long long dx = x - point_x;
|
||||
long long dy = y - point_y;
|
||||
double dx = x - point_x;
|
||||
double dy = y - point_y;
|
||||
|
||||
return dx * dx + dy * dy;
|
||||
double out = std::round(sqrt(dx * dx + dy * dy) * 16.0) / 16.0;
|
||||
return out;
|
||||
}
|
||||
|
||||
// https://github.com/Project-OSRM/osrm-backend/blob/733d1384a40f/Algorithms/DouglasePeucker.cpp
|
||||
static void douglas_peucker(drawvec &geom, int start, int n, double e, size_t kept, size_t retain) {
|
||||
e = e * e;
|
||||
std::stack<int> recursion_stack;
|
||||
|
||||
{
|
||||
int left_border = 0;
|
||||
int right_border = 1;
|
||||
// Sweep linerarily over array and identify those ranges that need to be checked
|
||||
do {
|
||||
if (geom[start + right_border].necessary) {
|
||||
recursion_stack.push(left_border);
|
||||
recursion_stack.push(right_border);
|
||||
left_border = right_border;
|
||||
}
|
||||
++right_border;
|
||||
} while (right_border < n);
|
||||
if (!geom[start + 0].necessary || !geom[start + n - 1].necessary) {
|
||||
fprintf(stderr, "endpoints not marked necessary\n");
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
int prev = 0;
|
||||
for (int here = 1; here < n; here++) {
|
||||
if (geom[start + here].necessary) {
|
||||
recursion_stack.push(prev);
|
||||
recursion_stack.push(here);
|
||||
prev = here;
|
||||
|
||||
if (prevent[P_SIMPLIFY_SHARED_NODES]) {
|
||||
if (retain > 0) {
|
||||
retain--;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// These segments are put on the stack from start to end,
|
||||
// independent of winding, so note that anything that uses
|
||||
// "retain" to force it to keep at least N points will
|
||||
// keep a different set of points when wound one way than
|
||||
// when wound the other way.
|
||||
|
||||
while (!recursion_stack.empty()) {
|
||||
// pop next element
|
||||
int second = recursion_stack.top();
|
||||
@@ -384,18 +366,33 @@ static void douglas_peucker(drawvec &geom, int start, int n, double e, size_t ke
|
||||
recursion_stack.pop();
|
||||
|
||||
double max_distance = -1;
|
||||
int farthest_element_index = second;
|
||||
int farthest_element_index;
|
||||
|
||||
// find index idx of element with max_distance
|
||||
int i;
|
||||
for (i = first + 1; i < second; i++) {
|
||||
double temp_dist = square_distance_from_line(geom[start + i].x, geom[start + i].y, geom[start + first].x, geom[start + first].y, geom[start + second].x, geom[start + second].y);
|
||||
if (geom[start + first] < geom[start + second]) {
|
||||
farthest_element_index = first;
|
||||
for (i = first + 1; i < second; i++) {
|
||||
double temp_dist = distance_from_line(geom[start + i].x, geom[start + i].y, geom[start + first].x, geom[start + first].y, geom[start + second].x, geom[start + second].y);
|
||||
|
||||
double distance = std::fabs(temp_dist);
|
||||
double distance = std::fabs(temp_dist);
|
||||
|
||||
if ((distance > e || kept < retain) && distance > max_distance) {
|
||||
farthest_element_index = i;
|
||||
max_distance = distance;
|
||||
if ((distance > e || kept < retain) && (distance > max_distance || (distance == max_distance && geom[start + i] < geom[start + farthest_element_index]))) {
|
||||
farthest_element_index = i;
|
||||
max_distance = distance;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
farthest_element_index = second;
|
||||
for (i = second - 1; i > first; i--) {
|
||||
double temp_dist = distance_from_line(geom[start + i].x, geom[start + i].y, geom[start + second].x, geom[start + second].y, geom[start + first].x, geom[start + first].y);
|
||||
|
||||
double distance = std::fabs(temp_dist);
|
||||
|
||||
if ((distance > e || kept < retain) && (distance > max_distance || (distance == max_distance && geom[start + i] < geom[start + farthest_element_index]))) {
|
||||
farthest_element_index = i;
|
||||
max_distance = distance;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -404,13 +401,24 @@ static void douglas_peucker(drawvec &geom, int start, int n, double e, size_t ke
|
||||
geom[start + farthest_element_index].necessary = 1;
|
||||
kept++;
|
||||
|
||||
if (1 < farthest_element_index - first) {
|
||||
recursion_stack.push(first);
|
||||
recursion_stack.push(farthest_element_index);
|
||||
}
|
||||
if (1 < second - farthest_element_index) {
|
||||
recursion_stack.push(farthest_element_index);
|
||||
recursion_stack.push(second);
|
||||
if (geom[start + first] < geom[start + second]) {
|
||||
if (1 < farthest_element_index - first) {
|
||||
recursion_stack.push(first);
|
||||
recursion_stack.push(farthest_element_index);
|
||||
}
|
||||
if (1 < second - farthest_element_index) {
|
||||
recursion_stack.push(farthest_element_index);
|
||||
recursion_stack.push(second);
|
||||
}
|
||||
} else {
|
||||
if (1 < second - farthest_element_index) {
|
||||
recursion_stack.push(farthest_element_index);
|
||||
recursion_stack.push(second);
|
||||
}
|
||||
if (1 < farthest_element_index - first) {
|
||||
recursion_stack.push(first);
|
||||
recursion_stack.push(farthest_element_index);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -419,26 +427,26 @@ static void douglas_peucker(drawvec &geom, int start, int n, double e, size_t ke
|
||||
// If any line segment crosses a tile boundary, add a node there
|
||||
// that cannot be simplified away, to prevent the edge of any
|
||||
// feature from jumping abruptly at the tile boundary.
|
||||
drawvec impose_tile_boundaries(drawvec &geom, long long extent) {
|
||||
drawvec impose_tile_boundaries(const drawvec &geom, long long extent) {
|
||||
drawvec out;
|
||||
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (i > 0 && geom[i].op == VT_LINETO && (geom[i - 1].op == VT_MOVETO || geom[i - 1].op == VT_LINETO)) {
|
||||
double x1 = geom[i - 1].x;
|
||||
double y1 = geom[i - 1].y;
|
||||
long long x1 = geom[i - 1].x;
|
||||
long long y1 = geom[i - 1].y;
|
||||
|
||||
double x2 = geom[i - 0].x;
|
||||
double y2 = geom[i - 0].y;
|
||||
long long x2 = geom[i - 0].x;
|
||||
long long y2 = geom[i - 0].y;
|
||||
|
||||
int c = clip(&x1, &y1, &x2, &y2, 0, 0, extent, extent);
|
||||
|
||||
if (c > 1) { // clipped
|
||||
if (x1 != geom[i - 1].x || y1 != geom[i - 1].y) {
|
||||
out.push_back(draw(VT_LINETO, x1, y1));
|
||||
out.emplace_back(VT_LINETO, x1, y1);
|
||||
out[out.size() - 1].necessary = 1;
|
||||
}
|
||||
if (x2 != geom[i - 0].x || y2 != geom[i - 0].y) {
|
||||
out.push_back(draw(VT_LINETO, x2, y2));
|
||||
out.emplace_back(VT_LINETO, x2, y2);
|
||||
out[out.size() - 1].necessary = 1;
|
||||
}
|
||||
}
|
||||
@@ -450,7 +458,7 @@ drawvec impose_tile_boundaries(drawvec &geom, long long extent) {
|
||||
return out;
|
||||
}
|
||||
|
||||
drawvec simplify_lines(drawvec &geom, int z, int detail, bool mark_tile_bounds, double simplification, size_t retain, drawvec const &shared_nodes) {
|
||||
drawvec simplify_lines(drawvec &geom, int z, int tx, int ty, int detail, bool mark_tile_bounds, double simplification, size_t retain, drawvec const &shared_nodes, struct node *shared_nodes_map, size_t nodepos) {
|
||||
int res = 1 << (32 - detail - z);
|
||||
long long area = 1LL << (32 - z);
|
||||
|
||||
@@ -466,10 +474,35 @@ drawvec simplify_lines(drawvec &geom, int z, int detail, bool mark_tile_bounds,
|
||||
}
|
||||
|
||||
if (prevent[P_SIMPLIFY_SHARED_NODES]) {
|
||||
// This is kind of weird, because we have two lists of shared nodes to look through:
|
||||
// * the drawvec, which is nodes that were introduced during clipping to the tile edge,
|
||||
// and which are in local tile coordinates
|
||||
// * the shared_nodes_map, which was made globally before tiling began, and which
|
||||
// is in global quadkey coordinates.
|
||||
// To look through the latter, we need to offset and encode the coordinates
|
||||
// of the feature we are simplifying.
|
||||
|
||||
auto pt = std::lower_bound(shared_nodes.begin(), shared_nodes.end(), geom[i]);
|
||||
if (pt != shared_nodes.end() && *pt == geom[i]) {
|
||||
geom[i].necessary = true;
|
||||
}
|
||||
|
||||
if (nodepos > 0) {
|
||||
// offset to global
|
||||
draw d = geom[i];
|
||||
if (z != 0) {
|
||||
d.x += tx * (1LL << (32 - z));
|
||||
d.y += ty * (1LL << (32 - z));
|
||||
}
|
||||
|
||||
// to quadkey
|
||||
struct node n;
|
||||
n.index = encode_quadkey((unsigned) d.x, (unsigned) d.y);
|
||||
|
||||
if (bsearch(&n, shared_nodes_map, nodepos / sizeof(node), sizeof(node), nodecmp) != NULL) {
|
||||
geom[i].necessary = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -507,17 +540,17 @@ drawvec simplify_lines(drawvec &geom, int z, int detail, bool mark_tile_bounds,
|
||||
}
|
||||
}
|
||||
|
||||
drawvec out;
|
||||
size_t out = 0;
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (geom[i].necessary) {
|
||||
out.push_back(geom[i]);
|
||||
geom[out++] = geom[i];
|
||||
}
|
||||
}
|
||||
|
||||
return out;
|
||||
geom.resize(out);
|
||||
return geom;
|
||||
}
|
||||
|
||||
drawvec reorder_lines(drawvec &geom) {
|
||||
drawvec reorder_lines(const drawvec &geom) {
|
||||
// Only reorder simple linestrings with a single moveto
|
||||
|
||||
if (geom.size() == 0) {
|
||||
@@ -527,13 +560,16 @@ drawvec reorder_lines(drawvec &geom) {
|
||||
for (size_t i = 0; i < geom.size(); i++) {
|
||||
if (geom[i].op == VT_MOVETO) {
|
||||
if (i != 0) {
|
||||
// moveto is not at the start, so it is not simple
|
||||
return geom;
|
||||
}
|
||||
} else if (geom[i].op == VT_LINETO) {
|
||||
if (i == 0) {
|
||||
// lineto is at the start: can't happen
|
||||
return geom;
|
||||
}
|
||||
} else {
|
||||
// something other than moveto or lineto: can't happen
|
||||
return geom;
|
||||
}
|
||||
}
|
||||
@@ -551,14 +587,16 @@ drawvec reorder_lines(drawvec &geom) {
|
||||
out.push_back(geom[geom.size() - 1 - i]);
|
||||
}
|
||||
out[0].op = VT_MOVETO;
|
||||
out[out.size() - 1].op = VT_LINETO;
|
||||
if (out.size() > 1) {
|
||||
out[out.size() - 1].op = VT_LINETO;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
return geom;
|
||||
}
|
||||
|
||||
drawvec fix_polygon(drawvec &geom) {
|
||||
drawvec fix_polygon(const drawvec &geom) {
|
||||
int outer = 1;
|
||||
drawvec out;
|
||||
|
||||
@@ -577,9 +615,9 @@ drawvec fix_polygon(drawvec &geom) {
|
||||
|
||||
// A polygon ring must contain at least three points
|
||||
// (and really should contain four). If this one does
|
||||
// not have enough, avoid a division by zero trying to
|
||||
// not have any, avoid a division by zero trying to
|
||||
// calculate the centroid below.
|
||||
if (j - i < 3) {
|
||||
if (j - i < 1) {
|
||||
i = j - 1;
|
||||
outer = 0;
|
||||
continue;
|
||||
@@ -596,6 +634,13 @@ drawvec fix_polygon(drawvec &geom) {
|
||||
ring.push_back(ring[0]);
|
||||
}
|
||||
|
||||
// A polygon ring at this point should contain at least four points.
|
||||
// Flesh it out with some vertex copies if it doesn't.
|
||||
|
||||
while (ring.size() < 4) {
|
||||
ring.push_back(ring[0]);
|
||||
}
|
||||
|
||||
// Reverse ring if winding order doesn't match
|
||||
// inner/outer expectation
|
||||
|
||||
@@ -621,6 +666,9 @@ drawvec fix_polygon(drawvec &geom) {
|
||||
ring = tmp;
|
||||
}
|
||||
|
||||
// Now we are rotating the ring to make the first/last point
|
||||
// one that would be unlikely to be simplified away.
|
||||
|
||||
// calculate centroid
|
||||
// a + 1 < size() because point 0 is duplicated at the end
|
||||
long long xtotal = 0;
|
||||
@@ -638,23 +686,27 @@ drawvec fix_polygon(drawvec &geom) {
|
||||
long long dist2 = 0;
|
||||
long long furthest = 0;
|
||||
for (size_t a = 0; a + 1 < ring.size(); a++) {
|
||||
long long xd = ring[a].x - xtotal;
|
||||
long long yd = ring[a].y - ytotal;
|
||||
// division by 16 because these are z0 coordinates and we need to avoid overflow
|
||||
long long xd = (ring[a].x - xtotal) / 16;
|
||||
long long yd = (ring[a].y - ytotal) / 16;
|
||||
long long d2 = xd * xd + yd * yd;
|
||||
if (d2 > dist2) {
|
||||
if (d2 > dist2 || (d2 == dist2 && ring[a] < ring[furthest])) {
|
||||
dist2 = d2;
|
||||
furthest = a;
|
||||
}
|
||||
}
|
||||
|
||||
// then figure out which point is furthest from *that*
|
||||
// then figure out which point is furthest from *that*,
|
||||
// which will hopefully be a good origin point since it should be
|
||||
// at a far edge of the shape.
|
||||
long long dist2b = 0;
|
||||
long long furthestb = 0;
|
||||
for (size_t a = 0; a + 1 < ring.size(); a++) {
|
||||
long long xd = ring[a].x - ring[furthest].x;
|
||||
long long yd = ring[a].y - ring[furthest].y;
|
||||
// division by 16 because these are z0 coordinates and we need to avoid overflow
|
||||
long long xd = (ring[a].x - ring[furthest].x) / 16;
|
||||
long long yd = (ring[a].y - ring[furthest].y) / 16;
|
||||
long long d2 = xd * xd + yd * yd;
|
||||
if (d2 > dist2b) {
|
||||
if (d2 > dist2b || (d2 == dist2b && ring[a] < ring[furthestb])) {
|
||||
dist2b = d2;
|
||||
furthestb = a;
|
||||
}
|
||||
@@ -692,6 +744,7 @@ drawvec fix_polygon(drawvec &geom) {
|
||||
return out;
|
||||
}
|
||||
|
||||
#if 0
|
||||
std::vector<drawvec> chop_polygon(std::vector<drawvec> &geoms) {
|
||||
while (1) {
|
||||
bool again = false;
|
||||
@@ -735,15 +788,11 @@ std::vector<drawvec> chop_polygon(std::vector<drawvec> &geoms) {
|
||||
drawvec c1, c2;
|
||||
|
||||
if (maxy - miny > maxx - minx) {
|
||||
// printf("clipping y to %lld %lld %lld %lld\n", minx, miny, maxx, midy);
|
||||
c1 = simple_clip_poly(geoms[i], minx, miny, maxx, midy);
|
||||
// printf(" and %lld %lld %lld %lld\n", minx, midy, maxx, maxy);
|
||||
c2 = simple_clip_poly(geoms[i], minx, midy, maxx, maxy);
|
||||
c1 = simple_clip_poly(geoms[i], minx, miny, maxx, midy, prevent[P_SIMPLIFY_EDGE_NODES]);
|
||||
c2 = simple_clip_poly(geoms[i], minx, midy, maxx, maxy, prevent[P_SIMPLIFY_EDGE_NODES]);
|
||||
} else {
|
||||
// printf("clipping x to %lld %lld %lld %lld\n", minx, miny, midx, maxy);
|
||||
c1 = simple_clip_poly(geoms[i], minx, miny, midx, maxy);
|
||||
// printf(" and %lld %lld %lld %lld\n", midx, midy, maxx, maxy);
|
||||
c2 = simple_clip_poly(geoms[i], midx, miny, maxx, maxy);
|
||||
c1 = simple_clip_poly(geoms[i], minx, miny, midx, maxy, prevent[P_SIMPLIFY_EDGE_NODES]);
|
||||
c2 = simple_clip_poly(geoms[i], midx, miny, maxx, maxy, prevent[P_SIMPLIFY_EDGE_NODES]);
|
||||
}
|
||||
|
||||
if (c1.size() >= geoms[i].size()) {
|
||||
@@ -770,6 +819,7 @@ std::vector<drawvec> chop_polygon(std::vector<drawvec> &geoms) {
|
||||
geoms = out;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
drawvec stairstep(drawvec &geom, int z, int detail) {
|
||||
drawvec out;
|
||||
@@ -965,25 +1015,25 @@ double label_goodness(const drawvec &dv, long long x, long long y) {
|
||||
return 0; // outside the polygon is as bad as it gets
|
||||
}
|
||||
|
||||
double closest = INFINITY; // square of closest distance to the border
|
||||
double closest = INFINITY; // closest distance to the border
|
||||
|
||||
for (size_t i = 0; i < dv.size(); i++) {
|
||||
double dx = dv[i].x - x;
|
||||
double dy = dv[i].y - y;
|
||||
double squared = dx * dx + dy * dy;
|
||||
if (squared < closest) {
|
||||
closest = squared;
|
||||
double dist = sqrt(dx * dx + dy * dy);
|
||||
if (dist < closest) {
|
||||
closest = dist;
|
||||
}
|
||||
|
||||
if (i > 0 && dv[i].op == VT_LINETO) {
|
||||
squared = square_distance_from_line(x, y, dv[i - 1].x, dv[i - 1].y, dv[i].x, dv[i].y);
|
||||
if (squared < closest) {
|
||||
closest = squared;
|
||||
dist = distance_from_line(x, y, dv[i - 1].x, dv[i - 1].y, dv[i].x, dv[i].y);
|
||||
if (dist < closest) {
|
||||
closest = dist;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return sqrt(closest);
|
||||
return closest;
|
||||
}
|
||||
|
||||
struct sorty {
|
||||
@@ -1146,7 +1196,7 @@ drawvec polygon_to_anchor(const drawvec &geom) {
|
||||
std::vector<candidate> candidates;
|
||||
|
||||
for (size_t pass = 0; pass < 4; pass++) {
|
||||
std::sort(points.begin(), points.end(), sorty_sorter(pass));
|
||||
std::stable_sort(points.begin(), points.end(), sorty_sorter(pass));
|
||||
|
||||
for (size_t i = 1; i < points.size(); i++) {
|
||||
double dx = points[i].x - points[i - 1].x;
|
||||
@@ -1170,7 +1220,7 @@ drawvec polygon_to_anchor(const drawvec &geom) {
|
||||
// segment, if we find one whose midpoint is inside the polygon and
|
||||
// far enough from any edge to be good enough, stop looking.
|
||||
|
||||
std::sort(candidates.begin(), candidates.end());
|
||||
std::stable_sort(candidates.begin(), candidates.end());
|
||||
// only check the top 50 stride midpoints, since this list can be quite large
|
||||
for (size_t i = 0; i < candidates.size() && i < 50; i++) {
|
||||
double maybe_goodness = label_goodness(geom, candidates[i].x, candidates[i].y);
|
||||
|
||||
+36
-10
@@ -3,8 +3,13 @@
|
||||
|
||||
#include <vector>
|
||||
#include <atomic>
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <sqlite3.h>
|
||||
#include <stdio.h>
|
||||
#include <mvt.hpp>
|
||||
#include "jsonpull/jsonpull.h"
|
||||
#include "attribute.hpp"
|
||||
|
||||
#define VT_POINT 1
|
||||
#define VT_LINE 2
|
||||
@@ -46,6 +51,10 @@ struct draw {
|
||||
}
|
||||
}
|
||||
|
||||
bool operator>(draw const &s) const {
|
||||
return s < *this;
|
||||
}
|
||||
|
||||
bool operator==(draw const &s) const {
|
||||
return y == s.y && x == s.x;
|
||||
}
|
||||
@@ -58,23 +67,22 @@ struct draw {
|
||||
typedef std::vector<draw> drawvec;
|
||||
struct serial_feature;
|
||||
|
||||
drawvec decode_geometry(char **meta, int z, unsigned tx, unsigned ty, long long *bbox, unsigned initial_x, unsigned initial_y);
|
||||
drawvec decode_geometry(const char **meta, int z, unsigned tx, unsigned ty, long long *bbox, unsigned initial_x, unsigned initial_y);
|
||||
void to_tile_scale(drawvec &geom, int z, int detail);
|
||||
drawvec from_tile_scale(drawvec const &geom, int z, int detail);
|
||||
drawvec remove_noop(drawvec geom, int type, int shift);
|
||||
drawvec clip_point(drawvec &geom, int z, long long buffer);
|
||||
drawvec clean_or_clip_poly(drawvec &geom, int z, int buffer, bool clip);
|
||||
drawvec simple_clip_poly(drawvec &geom, int z, int buffer);
|
||||
drawvec clean_or_clip_poly(drawvec &geom, int z, int buffer, bool clip, bool try_scaling);
|
||||
drawvec close_poly(drawvec &geom);
|
||||
drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double *accum_area, serial_feature *this_feature, serial_feature *tiny_feature);
|
||||
int clip(double *x0, double *y0, double *x1, double *y1, double xmin, double ymin, double xmax, double ymax);
|
||||
drawvec reduce_tiny_poly(const drawvec &geom, int z, int detail, bool *still_needs_simplification, bool *reduced_away, double *accum_area);
|
||||
int clip(long long *x0, long long *y0, long long *x1, long long *y1, long long xmin, long long ymin, long long xmax, long long ymax);
|
||||
drawvec clip_lines(drawvec &geom, int z, long long buffer);
|
||||
drawvec stairstep(drawvec &geom, int z, int detail);
|
||||
bool point_within_tile(long long x, long long y, int z);
|
||||
int quick_check(long long *bbox, int z, long long buffer);
|
||||
drawvec simplify_lines(drawvec &geom, int z, int detail, bool mark_tile_bounds, double simplification, size_t retain, drawvec const &shared_nodes);
|
||||
drawvec reorder_lines(drawvec &geom);
|
||||
drawvec fix_polygon(drawvec &geom);
|
||||
int quick_check(const long long *bbox, int z, long long buffer);
|
||||
drawvec simplify_lines(drawvec &geom, int z, int tx, int ty, int detail, bool mark_tile_bounds, double simplification, size_t retain, drawvec const &shared_nodes, struct node *shared_nodes_map, size_t nodepos);
|
||||
drawvec reorder_lines(const drawvec &geom);
|
||||
drawvec fix_polygon(const drawvec &geom);
|
||||
std::vector<drawvec> chop_polygon(std::vector<drawvec> &geoms);
|
||||
void check_polygon(drawvec &geom);
|
||||
double get_area(const drawvec &geom, size_t i, size_t j);
|
||||
@@ -82,10 +90,28 @@ double get_mp_area(drawvec &geom);
|
||||
drawvec polygon_to_anchor(const drawvec &geom);
|
||||
drawvec checkerboard_anchors(drawvec const &geom, int tx, int ty, int z, unsigned long long label_point);
|
||||
|
||||
drawvec simple_clip_poly(drawvec &geom, long long x1, long long y1, long long x2, long long y2);
|
||||
drawvec simple_clip_poly(drawvec &geom, int z, int buffer, drawvec &shared_nodes, bool prevent_simplify_shared_nodes);
|
||||
drawvec simple_clip_poly(drawvec &geom, long long x1, long long y1, long long x2, long long y2, bool prevent_simplify_shared_nodes);
|
||||
drawvec simple_clip_poly(drawvec &geom, long long x1, long long y1, long long x2, long long y2,
|
||||
long long ax, long long ay, long long bx, long long by, drawvec &shared_nodes, bool prevent_simplify_shared_nodes);
|
||||
drawvec clip_lines(drawvec &geom, long long x1, long long y1, long long x2, long long y2);
|
||||
drawvec clip_point(drawvec &geom, long long x1, long long y1, long long x2, long long y2);
|
||||
void visvalingam(drawvec &ls, size_t start, size_t end, double threshold, size_t retain);
|
||||
int pnpoly(const drawvec &vert, size_t start, size_t nvert, long long testx, long long testy);
|
||||
double distance_from_line(long long point_x, long long point_y, long long segA_x, long long segA_y, long long segB_x, long long segB_y);
|
||||
|
||||
std::string overzoom(const mvt_tile &tile, int oz, int ox, int oy, int nz, int nx, int ny,
|
||||
int detail, int buffer, std::set<std::string> const &keep, bool do_compress,
|
||||
std::vector<std::pair<unsigned, unsigned>> *next_overzoomed_tiles,
|
||||
bool demultiply, json_object *filter, bool preserve_input_order,
|
||||
std::unordered_map<std::string, attribute_op> const &attribute_accum,
|
||||
std::vector<std::string> const &unidecode_data);
|
||||
|
||||
std::string overzoom(const std::string &s, int oz, int ox, int oy, int nz, int nx, int ny,
|
||||
int detail, int buffer, std::set<std::string> const &keep, bool do_compress,
|
||||
std::vector<std::pair<unsigned, unsigned>> *next_overzoomed_tiles,
|
||||
bool demultiply, json_object *filter, bool preserve_input_order,
|
||||
std::unordered_map<std::string, attribute_op> const &attribute_accum,
|
||||
std::vector<std::string> const &unidecode_data);
|
||||
|
||||
#endif
|
||||
|
||||
+105
-74
@@ -10,6 +10,15 @@
|
||||
|
||||
#define BUFFER 10000
|
||||
|
||||
struct string {
|
||||
char *buf;
|
||||
size_t n;
|
||||
size_t nalloc;
|
||||
};
|
||||
|
||||
static void string_init(struct string *s);
|
||||
static void string_free(struct string *s);
|
||||
|
||||
json_pull *json_begin(ssize_t (*read)(struct json_pull *, char *buffer, size_t n), void *source) {
|
||||
json_pull *j = malloc(sizeof(json_pull));
|
||||
if (j == NULL) {
|
||||
@@ -33,6 +42,13 @@ json_pull *json_begin(ssize_t (*read)(struct json_pull *, char *buffer, size_t n
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
j->number_buffer = malloc(sizeof(struct string));
|
||||
if (j->number_buffer == NULL) {
|
||||
perror("Out of memory");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
string_init(j->number_buffer);
|
||||
|
||||
return j;
|
||||
}
|
||||
|
||||
@@ -88,6 +104,9 @@ json_pull *json_begin_string(const char *s) {
|
||||
}
|
||||
|
||||
void json_end(json_pull *p) {
|
||||
string_free(p->number_buffer);
|
||||
free(p->number_buffer);
|
||||
|
||||
json_free(p->root);
|
||||
free(p->buffer);
|
||||
free(p);
|
||||
@@ -103,7 +122,7 @@ static inline int read_wrap(json_pull *j) {
|
||||
return c;
|
||||
}
|
||||
|
||||
#define SIZE_FOR(i, size) ((size_t)((((i) + 7) & ~7) * size))
|
||||
#define SIZE_FOR(i, size) ((size_t) ((((i) + 7) & ~7) * size))
|
||||
|
||||
static json_object *fabricate_object(json_pull *jp, json_object *parent, json_type type) {
|
||||
json_object *o = malloc(sizeof(struct json_object));
|
||||
@@ -215,12 +234,6 @@ json_object *json_hash_get(json_object *o, const char *s) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
struct string {
|
||||
char *buf;
|
||||
size_t n;
|
||||
size_t nalloc;
|
||||
};
|
||||
|
||||
static void string_init(struct string *s) {
|
||||
s->nalloc = 500;
|
||||
s->buf = malloc(s->nalloc);
|
||||
@@ -292,38 +305,45 @@ json_object *json_read_separators(json_pull *j, json_separator_callback cb, void
|
||||
}
|
||||
|
||||
again:
|
||||
/////////////////////////// Whitespace
|
||||
|
||||
do {
|
||||
c = read_wrap(j);
|
||||
if (c == EOF) {
|
||||
if (j->container != NULL) {
|
||||
j->error = "Reached EOF without all containers being closed";
|
||||
}
|
||||
|
||||
return NULL;
|
||||
c = read_wrap(j);
|
||||
if (c == EOF) {
|
||||
if (j->container != NULL) {
|
||||
j->error = "Reached EOF without all containers being closed";
|
||||
}
|
||||
|
||||
// Byte-order mark
|
||||
if (c == 0xEF) {
|
||||
int c2 = peek(j);
|
||||
if (c2 == 0xBB) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
switch (c) {
|
||||
/////////////////////////// Byte order mark
|
||||
|
||||
case 0xEF: {
|
||||
int c2 = peek(j);
|
||||
if (c2 == 0xBB) {
|
||||
c2 = read_wrap(j);
|
||||
c2 = peek(j);
|
||||
if (c2 == 0xBF) {
|
||||
c2 = read_wrap(j);
|
||||
c2 = peek(j);
|
||||
if (c2 == 0xBF) {
|
||||
c2 = read_wrap(j);
|
||||
c = ' ';
|
||||
continue;
|
||||
}
|
||||
c = ' ';
|
||||
goto again;
|
||||
}
|
||||
j->error = "Corrupt byte-order mark found";
|
||||
return NULL;
|
||||
}
|
||||
} while (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 0x1E);
|
||||
j->error = "Corrupt byte-order mark found";
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/////////////////////////// Arrays
|
||||
/////////////////////////// Whitespace
|
||||
|
||||
if (c == '[') {
|
||||
case ' ':
|
||||
case '\t':
|
||||
case '\r':
|
||||
case '\n':
|
||||
case 0x1E:
|
||||
goto again;
|
||||
|
||||
/////////////////////////// Arrays
|
||||
|
||||
case '[': {
|
||||
json_object *o = add_object(j, JSON_ARRAY);
|
||||
if (o == NULL) {
|
||||
return NULL;
|
||||
@@ -336,7 +356,9 @@ again:
|
||||
}
|
||||
|
||||
goto again;
|
||||
} else if (c == ']') {
|
||||
}
|
||||
|
||||
case ']': {
|
||||
if (j->container == NULL) {
|
||||
j->error = "Found ] at top level";
|
||||
return NULL;
|
||||
@@ -359,9 +381,9 @@ again:
|
||||
return ret;
|
||||
}
|
||||
|
||||
/////////////////////////// Hashes
|
||||
/////////////////////////// Hashes
|
||||
|
||||
if (c == '{') {
|
||||
case '{': {
|
||||
json_object *o = add_object(j, JSON_HASH);
|
||||
if (o == NULL) {
|
||||
return NULL;
|
||||
@@ -374,7 +396,9 @@ again:
|
||||
}
|
||||
|
||||
goto again;
|
||||
} else if (c == '}') {
|
||||
}
|
||||
|
||||
case '}': {
|
||||
if (j->container == NULL) {
|
||||
j->error = "Found } at top level";
|
||||
return NULL;
|
||||
@@ -397,9 +421,9 @@ again:
|
||||
return ret;
|
||||
}
|
||||
|
||||
/////////////////////////// Null
|
||||
/////////////////////////// Null
|
||||
|
||||
if (c == 'n') {
|
||||
case 'n': {
|
||||
if (read_wrap(j) != 'u' || read_wrap(j) != 'l' || read_wrap(j) != 'l') {
|
||||
j->error = "Found misspelling of null";
|
||||
return NULL;
|
||||
@@ -408,9 +432,9 @@ again:
|
||||
return add_object(j, JSON_NULL);
|
||||
}
|
||||
|
||||
/////////////////////////// NaN
|
||||
/////////////////////////// NaN
|
||||
|
||||
if (c == 'N') {
|
||||
case 'N': {
|
||||
if (read_wrap(j) != 'a' || read_wrap(j) != 'N') {
|
||||
j->error = "Found misspelling of NaN";
|
||||
return NULL;
|
||||
@@ -420,9 +444,9 @@ again:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/////////////////////////// Infinity
|
||||
/////////////////////////// Infinity
|
||||
|
||||
if (c == 'I') {
|
||||
case 'I': {
|
||||
if (read_wrap(j) != 'n' || read_wrap(j) != 'f' || read_wrap(j) != 'i' ||
|
||||
read_wrap(j) != 'n' || read_wrap(j) != 'i' || read_wrap(j) != 't' ||
|
||||
read_wrap(j) != 'y') {
|
||||
@@ -434,9 +458,9 @@ again:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/////////////////////////// True
|
||||
/////////////////////////// True
|
||||
|
||||
if (c == 't') {
|
||||
case 't': {
|
||||
if (read_wrap(j) != 'r' || read_wrap(j) != 'u' || read_wrap(j) != 'e') {
|
||||
j->error = "Found misspelling of true";
|
||||
return NULL;
|
||||
@@ -445,9 +469,9 @@ again:
|
||||
return add_object(j, JSON_TRUE);
|
||||
}
|
||||
|
||||
/////////////////////////// False
|
||||
/////////////////////////// False
|
||||
|
||||
if (c == 'f') {
|
||||
case 'f': {
|
||||
if (read_wrap(j) != 'a' || read_wrap(j) != 'l' || read_wrap(j) != 's' || read_wrap(j) != 'e') {
|
||||
j->error = "Found misspelling of false";
|
||||
return NULL;
|
||||
@@ -456,9 +480,9 @@ again:
|
||||
return add_object(j, JSON_FALSE);
|
||||
}
|
||||
|
||||
/////////////////////////// Comma
|
||||
/////////////////////////// Comma
|
||||
|
||||
if (c == ',') {
|
||||
case ',': {
|
||||
if (j->container != NULL) {
|
||||
if (j->container->expect != JSON_COMMA) {
|
||||
j->error = "Found unexpected comma";
|
||||
@@ -479,9 +503,9 @@ again:
|
||||
goto again;
|
||||
}
|
||||
|
||||
/////////////////////////// Colon
|
||||
/////////////////////////// Colon
|
||||
|
||||
if (c == ':') {
|
||||
case ':': {
|
||||
if (j->container == NULL) {
|
||||
j->error = "Found colon at top level";
|
||||
return NULL;
|
||||
@@ -501,71 +525,80 @@ again:
|
||||
goto again;
|
||||
}
|
||||
|
||||
/////////////////////////// Numbers
|
||||
/////////////////////////// Numbers
|
||||
|
||||
if (c == '-' || (c >= '0' && c <= '9')) {
|
||||
struct string val;
|
||||
string_init(&val);
|
||||
case '-':
|
||||
case '0':
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
case '4':
|
||||
case '5':
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9': {
|
||||
j->number_buffer->n = 0;
|
||||
int decimal = 0;
|
||||
|
||||
if (c == '-') {
|
||||
string_append(&val, c);
|
||||
string_append(j->number_buffer, c);
|
||||
c = read_wrap(j);
|
||||
}
|
||||
|
||||
if (c == '0') {
|
||||
string_append(&val, c);
|
||||
string_append(j->number_buffer, c);
|
||||
} else if (c >= '1' && c <= '9') {
|
||||
string_append(&val, c);
|
||||
string_append(j->number_buffer, c);
|
||||
c = peek(j);
|
||||
|
||||
while (c >= '0' && c <= '9') {
|
||||
string_append(&val, read_wrap(j));
|
||||
string_append(j->number_buffer, read_wrap(j));
|
||||
c = peek(j);
|
||||
}
|
||||
}
|
||||
|
||||
if (peek(j) == '.') {
|
||||
string_append(&val, read_wrap(j));
|
||||
string_append(j->number_buffer, read_wrap(j));
|
||||
decimal = 1;
|
||||
|
||||
c = peek(j);
|
||||
if (c < '0' || c > '9') {
|
||||
j->error = "Decimal point without digits";
|
||||
string_free(&val);
|
||||
string_free(j->number_buffer);
|
||||
return NULL;
|
||||
}
|
||||
while (c >= '0' && c <= '9') {
|
||||
string_append(&val, read_wrap(j));
|
||||
string_append(j->number_buffer, read_wrap(j));
|
||||
c = peek(j);
|
||||
}
|
||||
}
|
||||
|
||||
c = peek(j);
|
||||
if (c == 'e' || c == 'E') {
|
||||
string_append(&val, read_wrap(j));
|
||||
string_append(j->number_buffer, read_wrap(j));
|
||||
decimal = 1;
|
||||
|
||||
c = peek(j);
|
||||
if (c == '+' || c == '-') {
|
||||
string_append(&val, read_wrap(j));
|
||||
string_append(j->number_buffer, read_wrap(j));
|
||||
}
|
||||
|
||||
c = peek(j);
|
||||
if (c < '0' || c > '9') {
|
||||
j->error = "Exponent without digits";
|
||||
string_free(&val);
|
||||
string_free(j->number_buffer);
|
||||
return NULL;
|
||||
}
|
||||
while (c >= '0' && c <= '9') {
|
||||
string_append(&val, read_wrap(j));
|
||||
string_append(j->number_buffer, read_wrap(j));
|
||||
c = peek(j);
|
||||
}
|
||||
}
|
||||
|
||||
json_object *n = add_object(j, JSON_NUMBER);
|
||||
if (n != NULL) {
|
||||
n->value.number.number = atof(val.buf);
|
||||
n->value.number.number = atof(j->number_buffer->buf);
|
||||
n->value.number.large_signed = 0;
|
||||
n->value.number.large_unsigned = 0;
|
||||
|
||||
@@ -575,7 +608,7 @@ again:
|
||||
if (!decimal && n->value.number.number > MAX_SAFE_INTEGER) {
|
||||
errno = 0;
|
||||
char *err = NULL;
|
||||
unsigned long long ull = strtoull(val.buf, &err, 10);
|
||||
unsigned long long ull = strtoull(j->number_buffer->buf, &err, 10);
|
||||
if (errno == 0 && (err == NULL || *err == '\0')) {
|
||||
n->value.number.large_unsigned = ull;
|
||||
}
|
||||
@@ -583,22 +616,18 @@ again:
|
||||
if (!decimal && n->value.number.number < MIN_SAFE_INTEGER) {
|
||||
errno = 0;
|
||||
char *err = NULL;
|
||||
long long ll = strtoll(val.buf, &err, 10);
|
||||
long long ll = strtoll(j->number_buffer->buf, &err, 10);
|
||||
if (errno == 0 && (err == NULL || *err == '\0')) {
|
||||
n->value.number.large_signed = ll;
|
||||
}
|
||||
}
|
||||
|
||||
string_free(&val);
|
||||
} else {
|
||||
string_free(&val);
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
/////////////////////////// Strings
|
||||
/////////////////////////// Strings
|
||||
|
||||
if (c == '"') {
|
||||
case '"': {
|
||||
struct string val;
|
||||
string_init(&val);
|
||||
|
||||
@@ -726,11 +755,13 @@ again:
|
||||
json_object *s = add_object(j, JSON_STRING);
|
||||
if (s != NULL) {
|
||||
s->value.string.string = val.buf;
|
||||
s->value.string.refcon = NULL;
|
||||
} else {
|
||||
string_free(&val);
|
||||
}
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
j->error = "Found unexpected character";
|
||||
return NULL;
|
||||
|
||||
@@ -38,6 +38,7 @@ typedef struct json_object {
|
||||
|
||||
struct {
|
||||
char *string;
|
||||
void *refcon; // reference constant for caller's use
|
||||
} string;
|
||||
|
||||
struct {
|
||||
@@ -68,6 +69,8 @@ typedef struct json_pull {
|
||||
|
||||
json_object *container;
|
||||
json_object *root;
|
||||
|
||||
struct string *number_buffer;
|
||||
} json_pull;
|
||||
|
||||
json_pull *json_begin_file(FILE *f);
|
||||
|
||||
@@ -65,6 +65,9 @@
|
||||
#include "text.hpp"
|
||||
#include "errors.hpp"
|
||||
#include "read_json.hpp"
|
||||
#include "sort.hpp"
|
||||
#include "attribute.hpp"
|
||||
#include "thread.hpp"
|
||||
|
||||
static int low_detail = 12;
|
||||
static int full_detail = -1;
|
||||
@@ -91,6 +94,9 @@ size_t limit_tile_feature_count_at_maxzoom = 0;
|
||||
unsigned int drop_denser = 0;
|
||||
std::map<std::string, serial_val> set_attributes;
|
||||
unsigned long long preserve_point_density_threshold = 0;
|
||||
long long extend_zooms_max = 0;
|
||||
int retain_points_multiplier = 1;
|
||||
std::vector<std::string> unidecode_data;
|
||||
|
||||
std::vector<order_field> order_by;
|
||||
bool order_reverse;
|
||||
@@ -120,7 +126,8 @@ void checkdisk(std::vector<struct reader> *r) {
|
||||
for (size_t i = 0; i < r->size(); i++) {
|
||||
// Pool and tree are used once.
|
||||
// Geometry and index will be duplicated during sorting and tiling.
|
||||
used += 2 * (*r)[i].geompos + 2 * (*r)[i].indexpos + (*r)[i].poolfile->off + (*r)[i].treefile->off;
|
||||
used += 2 * (*r)[i].geompos + 2 * (*r)[i].indexpos + (*r)[i].poolfile->off + (*r)[i].treefile->off +
|
||||
(*r)[i].vertexpos + (*r)[i].nodepos;
|
||||
}
|
||||
|
||||
static int warned = 0;
|
||||
@@ -300,7 +307,6 @@ int calc_feature_minzoom(struct index *ix, struct drop_state *ds, int maxzoom, d
|
||||
for (ssize_t i = maxzoom; i >= 0; i--) {
|
||||
ds[i].seq++;
|
||||
}
|
||||
ssize_t chosen = maxzoom + 1;
|
||||
for (ssize_t i = maxzoom; i >= 0; i--) {
|
||||
if (ds[i].seq < 0) {
|
||||
feature_minzoom = i + 1;
|
||||
@@ -314,7 +320,6 @@ int calc_feature_minzoom(struct index *ix, struct drop_state *ds, int maxzoom, d
|
||||
ds[j].previndex = ix->ix;
|
||||
}
|
||||
|
||||
chosen = i + 1;
|
||||
break;
|
||||
} else {
|
||||
ds[i].seq -= ds[i].interval;
|
||||
@@ -327,7 +332,7 @@ int calc_feature_minzoom(struct index *ix, struct drop_state *ds, int maxzoom, d
|
||||
// we will go ahead and push it out.
|
||||
|
||||
if (preserve_point_density_threshold > 0) {
|
||||
for (ssize_t i = 0; i < chosen && i < maxzoom; i++) {
|
||||
for (ssize_t i = 0; i < feature_minzoom && i < maxzoom; i++) {
|
||||
if (ix->ix - ds[i].previndex > ((1LL << (32 - i)) / preserve_point_density_threshold) * ((1LL << (32 - i)) / preserve_point_density_threshold)) {
|
||||
feature_minzoom = i;
|
||||
|
||||
@@ -445,7 +450,7 @@ void *run_sort(void *v) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void do_read_parallel(char *map, long long len, long long initial_offset, const char *reading, std::vector<struct reader> *readers, std::atomic<long long> *progress_seq, std::set<std::string> *exclude, std::set<std::string> *include, int exclude_all, int basezoom, int source, std::vector<std::map<std::string, layermap_entry> > *layermaps, int *initialized, unsigned *initial_x, unsigned *initial_y, int maxzoom, std::string layername, bool uses_gamma, std::map<std::string, int> const *attribute_types, int separator, double *dist_sum, size_t *dist_count, double *area_sum, bool want_dist, bool filters) {
|
||||
void do_read_parallel(char *map, long long len, long long initial_offset, const char *reading, std::vector<struct reader> *readers, std::atomic<long long> *progress_seq, std::set<std::string> *exclude, std::set<std::string> *include, int exclude_all, int basezoom, int source, std::vector<std::map<std::string, layermap_entry> > *layermaps, int *initialized, unsigned *initial_x, unsigned *initial_y, int maxzoom, std::string layername, bool uses_gamma, std::unordered_map<std::string, int> const *attribute_types, int separator, double *dist_sum, size_t *dist_count, double *area_sum, bool want_dist, bool filters) {
|
||||
long long segs[CPUS + 1];
|
||||
segs[0] = 0;
|
||||
segs[CPUS] = len;
|
||||
@@ -477,10 +482,10 @@ void do_read_parallel(char *map, long long len, long long initial_offset, const
|
||||
sst.resize(CPUS);
|
||||
|
||||
pthread_t pthreads[CPUS];
|
||||
std::vector<std::set<type_and_string> > file_subkeys;
|
||||
std::vector<std::set<serial_val> > file_subkeys;
|
||||
|
||||
for (size_t i = 0; i < CPUS; i++) {
|
||||
file_subkeys.push_back(std::set<type_and_string>());
|
||||
file_subkeys.push_back(std::set<serial_val>());
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < CPUS; i++) {
|
||||
@@ -515,7 +520,7 @@ void do_read_parallel(char *map, long long len, long long initial_offset, const
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < CPUS; i++) {
|
||||
if (pthread_create(&pthreads[i], NULL, run_parse_json, &pja[i]) != 0) {
|
||||
if (thread_create(&pthreads[i], NULL, run_parse_json, &pja[i]) != 0) {
|
||||
perror("pthread_create");
|
||||
exit(EXIT_PTHREAD);
|
||||
}
|
||||
@@ -646,7 +651,7 @@ struct read_parallel_arg {
|
||||
unsigned *initial_y = NULL;
|
||||
std::string layername = "";
|
||||
bool uses_gamma = false;
|
||||
std::map<std::string, int> const *attribute_types = NULL;
|
||||
std::unordered_map<std::string, int> const *attribute_types = NULL;
|
||||
double *dist_sum = NULL;
|
||||
size_t *dist_count = NULL;
|
||||
double *area_sum = NULL;
|
||||
@@ -690,7 +695,7 @@ void *run_read_parallel(void *v) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void start_parsing(int fd, STREAM *fp, long long offset, long long len, std::atomic<int> *is_parsing, pthread_t *parallel_parser, bool &parser_created, const char *reading, std::vector<struct reader> *readers, std::atomic<long long> *progress_seq, std::set<std::string> *exclude, std::set<std::string> *include, int exclude_all, int basezoom, int source, std::vector<std::map<std::string, layermap_entry> > &layermaps, int *initialized, unsigned *initial_x, unsigned *initial_y, int maxzoom, std::string layername, bool uses_gamma, std::map<std::string, int> const *attribute_types, int separator, double *dist_sum, size_t *dist_count, double *area_sum, bool want_dist, bool filters) {
|
||||
void start_parsing(int fd, STREAM *fp, long long offset, long long len, std::atomic<int> *is_parsing, pthread_t *parallel_parser, bool &parser_created, const char *reading, std::vector<struct reader> *readers, std::atomic<long long> *progress_seq, std::set<std::string> *exclude, std::set<std::string> *include, int exclude_all, int basezoom, int source, std::vector<std::map<std::string, layermap_entry> > &layermaps, int *initialized, unsigned *initial_x, unsigned *initial_y, int maxzoom, std::string layername, bool uses_gamma, std::unordered_map<std::string, int> const *attribute_types, int separator, double *dist_sum, size_t *dist_count, double *area_sum, bool want_dist, bool filters) {
|
||||
// This has to kick off an intermediate thread to start the parser threads,
|
||||
// so the main thread can get back to reading the next input stage while
|
||||
// the intermediate thread waits for the completion of the parser threads.
|
||||
@@ -732,7 +737,7 @@ void start_parsing(int fd, STREAM *fp, long long offset, long long len, std::ato
|
||||
rpa->want_dist = want_dist;
|
||||
rpa->filters = filters;
|
||||
|
||||
if (pthread_create(parallel_parser, NULL, run_read_parallel, rpa) != 0) {
|
||||
if (thread_create(parallel_parser, NULL, run_read_parallel, rpa) != 0) {
|
||||
perror("pthread_create");
|
||||
exit(EXIT_PTHREAD);
|
||||
}
|
||||
@@ -928,7 +933,7 @@ void radix1(int *geomfds_in, int *indexfds_in, int inputs, int prefix, int split
|
||||
}
|
||||
|
||||
for (size_t a = 0; a < CPUS; a++) {
|
||||
if (pthread_create(&pthreads[a], NULL, run_sort, &args[a]) != 0) {
|
||||
if (thread_create(&pthreads[a], NULL, run_sort, &args[a]) != 0) {
|
||||
perror("pthread_create");
|
||||
exit(EXIT_PTHREAD);
|
||||
}
|
||||
@@ -1206,7 +1211,35 @@ void choose_first_zoom(long long *file_bbox, long long *file_bbox1, long long *f
|
||||
}
|
||||
}
|
||||
|
||||
std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzoom, int basezoom, double basezoom_marker_width, sqlite3 *outdb, const char *outdir, std::set<std::string> *exclude, std::set<std::string> *include, int exclude_all, json_object *filter, double droprate, int buffer, const char *tmpdir, double gamma, int read_parallel, int forcetable, const char *attribution, bool uses_gamma, long long *file_bbox, long long *file_bbox1, long long *file_bbox2, const char *prefilter, const char *postfilter, const char *description, bool guess_maxzoom, bool guess_cluster_maxzoom, std::map<std::string, int> const *attribute_types, const char *pgm, std::map<std::string, attribute_op> const *attribute_accum, std::map<std::string, std::string> const &attribute_descriptions, std::string const &commandline, int minimum_maxzoom) {
|
||||
int vertexcmp(const void *void1, const void *void2) {
|
||||
vertex *v1 = (vertex *) void1;
|
||||
vertex *v2 = (vertex *) void2;
|
||||
|
||||
if (v1->mid < v2->mid) {
|
||||
return -1;
|
||||
}
|
||||
if (v1->mid > v2->mid) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (v1->p1 < v2->p1) {
|
||||
return -1;
|
||||
}
|
||||
if (v1->p1 > v2->p1) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (v1->p2 < v2->p2) {
|
||||
return -1;
|
||||
}
|
||||
if (v1->p2 > v2->p2) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzoom, int basezoom, double basezoom_marker_width, sqlite3 *outdb, const char *outdir, std::set<std::string> *exclude, std::set<std::string> *include, int exclude_all, json_object *filter, double droprate, int buffer, const char *tmpdir, double gamma, int read_parallel, int forcetable, const char *attribution, bool uses_gamma, long long *file_bbox, long long *file_bbox1, long long *file_bbox2, const char *prefilter, const char *postfilter, const char *description, bool guess_maxzoom, bool guess_cluster_maxzoom, std::unordered_map<std::string, int> const *attribute_types, const char *pgm, std::unordered_map<std::string, attribute_op> const *attribute_accum, std::map<std::string, std::string> const &attribute_descriptions, std::string const &commandline, int minimum_maxzoom) {
|
||||
int ret = EXIT_SUCCESS;
|
||||
|
||||
std::vector<struct reader> readers;
|
||||
@@ -1218,11 +1251,15 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
char treename[strlen(tmpdir) + strlen("/tree.XXXXXXXX") + 1];
|
||||
char geomname[strlen(tmpdir) + strlen("/geom.XXXXXXXX") + 1];
|
||||
char indexname[strlen(tmpdir) + strlen("/index.XXXXXXXX") + 1];
|
||||
char vertexname[strlen(tmpdir) + strlen("/vertex.XXXXXXXX") + 1];
|
||||
char nodename[strlen(tmpdir) + strlen("/node.XXXXXXXX") + 1];
|
||||
|
||||
snprintf(poolname, sizeof(poolname), "%s%s", tmpdir, "/pool.XXXXXXXX");
|
||||
snprintf(treename, sizeof(treename), "%s%s", tmpdir, "/tree.XXXXXXXX");
|
||||
snprintf(geomname, sizeof(geomname), "%s%s", tmpdir, "/geom.XXXXXXXX");
|
||||
snprintf(indexname, sizeof(indexname), "%s%s", tmpdir, "/index.XXXXXXXX");
|
||||
snprintf(vertexname, sizeof(vertexname), "%s%s", tmpdir, "/vertex.XXXXXXXX");
|
||||
snprintf(nodename, sizeof(nodename), "%s%s", tmpdir, "/node.XXXXXXXX");
|
||||
|
||||
r->poolfd = mkstemp_cloexec(poolname);
|
||||
if (r->poolfd < 0) {
|
||||
@@ -1244,6 +1281,16 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
perror(indexname);
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
r->vertexfd = mkstemp_cloexec(vertexname);
|
||||
if (r->vertexfd < 0) {
|
||||
perror(vertexname);
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
r->nodefd = mkstemp_cloexec(nodename);
|
||||
if (r->nodefd < 0) {
|
||||
perror(nodename);
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
|
||||
r->poolfile = memfile_open(r->poolfd);
|
||||
if (r->poolfile == NULL) {
|
||||
@@ -1265,18 +1312,33 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
perror(indexname);
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
r->vertexfile = fopen_oflag(vertexname, "w+b", O_RDWR | O_CLOEXEC);
|
||||
if (r->vertexfile == NULL) {
|
||||
perror(("open vertexfile " + std::string(vertexname)).c_str());
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
r->nodefile = fopen_oflag(nodename, "w+b", O_RDWR | O_CLOEXEC);
|
||||
if (r->nodefile == NULL) {
|
||||
perror(nodename);
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
r->geompos = 0;
|
||||
r->indexpos = 0;
|
||||
r->vertexpos = 0;
|
||||
r->nodepos = 0;
|
||||
|
||||
unlink(poolname);
|
||||
unlink(treename);
|
||||
unlink(geomname);
|
||||
unlink(indexname);
|
||||
unlink(vertexname);
|
||||
unlink(nodename);
|
||||
|
||||
// To distinguish a null value
|
||||
{
|
||||
struct stringpool p;
|
||||
memfile_write(r->treefile, &p, sizeof(struct stringpool));
|
||||
bool in_memory;
|
||||
memfile_write(r->treefile, &p, sizeof(struct stringpool), in_memory);
|
||||
}
|
||||
|
||||
r->file_bbox[0] = r->file_bbox[1] = UINT_MAX;
|
||||
@@ -1841,6 +1903,9 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
fflush(stderr);
|
||||
}
|
||||
|
||||
std::atomic<long long> vertexpos(0);
|
||||
std::atomic<long long> nodepos(0);
|
||||
|
||||
for (size_t i = 0; i < CPUS; i++) {
|
||||
if (fclose(readers[i].geomfile) != 0) {
|
||||
perror("fclose geom");
|
||||
@@ -1856,6 +1921,13 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
perror("stat geom\n");
|
||||
exit(EXIT_STAT);
|
||||
}
|
||||
|
||||
vertexpos += readers[i].vertexpos;
|
||||
nodepos += readers[i].nodepos;
|
||||
}
|
||||
|
||||
if (!quiet) {
|
||||
fprintf(stderr, "Merging string pool \r");
|
||||
}
|
||||
|
||||
// Create a combined string pool
|
||||
@@ -1884,7 +1956,6 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
}
|
||||
|
||||
unlink(poolname);
|
||||
|
||||
std::atomic<long long> poolpos(0);
|
||||
|
||||
for (size_t i = 0; i < CPUS; i++) {
|
||||
@@ -1948,6 +2019,162 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
madvise(stringpool, poolpos, MADV_RANDOM);
|
||||
}
|
||||
|
||||
if (!quiet) {
|
||||
fprintf(stderr, "Merging vertices \r");
|
||||
}
|
||||
|
||||
// Sort the vertices;
|
||||
// find nodes where the same central point is part of two different vertices
|
||||
{
|
||||
std::string tmpname = std::string(tmpdir) + "/vertex2.XXXXXX";
|
||||
int vertexfd = mkstemp((char *) tmpname.c_str());
|
||||
if (vertexfd < 0) {
|
||||
perror(("mkstemp vertexfile " + std::string(tmpname)).c_str());
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
unlink(tmpname.c_str());
|
||||
FILE *vertex_out = fdopen(vertexfd, "w+b");
|
||||
if (vertex_out == NULL) {
|
||||
perror(tmpname.c_str());
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
|
||||
std::vector<FILE *> vertex_readers;
|
||||
for (size_t i = 0; i < CPUS; i++) {
|
||||
vertex_readers.push_back(readers[i].vertexfile);
|
||||
rewind(readers[i].vertexfile);
|
||||
}
|
||||
fqsort(vertex_readers, sizeof(vertex), vertexcmp, vertex_out, memsize / 20);
|
||||
|
||||
for (size_t i = 0; i < CPUS; i++) {
|
||||
if (fclose(readers[i].vertexfile) != 0) {
|
||||
perror("fclose vertex");
|
||||
exit(EXIT_CLOSE);
|
||||
}
|
||||
}
|
||||
|
||||
rewind(vertex_out);
|
||||
|
||||
vertex prev(draw(VT_MOVETO, 0, 0), draw(VT_MOVETO, 0, 0), draw(VT_MOVETO, 0, 0));
|
||||
vertex v(draw(VT_MOVETO, 0, 0), draw(VT_MOVETO, 0, 0), draw(VT_MOVETO, 0, 0));
|
||||
while (fread((void *) &v, sizeof(vertex), 1, vertex_out)) {
|
||||
if (v.mid == prev.mid && (v.p1 != prev.p1 || v.p2 != prev.p2)) {
|
||||
long long x = v.mid.x * (1LL << geometry_scale);
|
||||
long long y = v.mid.y * (1LL << geometry_scale);
|
||||
|
||||
#if 0
|
||||
double lon, lat;
|
||||
tile2lonlat(x, y, 32, &lon, &lat);
|
||||
printf("{\"type\":\"Feature\", \"properties\":{}, \"geometry\":{\"type\":\"Point\", \"coordinates\":[%f,%f]}}\n", lon, lat);
|
||||
#endif
|
||||
|
||||
struct node n;
|
||||
n.index = encode_quadkey((unsigned) x, (unsigned) y);
|
||||
|
||||
fwrite_check((char *) &n, sizeof(struct node), 1, readers[0].nodefile, &readers[0].nodepos, "vertices");
|
||||
}
|
||||
prev = v;
|
||||
}
|
||||
|
||||
fclose(vertex_out);
|
||||
}
|
||||
|
||||
if (!quiet) {
|
||||
fprintf(stderr, "Merging nodes \r");
|
||||
}
|
||||
|
||||
// Sort nodes that can't be simplified away; scan the list to remove duplicates
|
||||
|
||||
FILE *shared_nodes;
|
||||
node *shared_nodes_map = NULL; // will be null if there are no shared nodes
|
||||
{
|
||||
// sort
|
||||
|
||||
std::string tmpname = std::string(tmpdir) + "/node2.XXXXXX";
|
||||
int nodefd = mkstemp((char *) tmpname.c_str());
|
||||
if (nodefd < 0) {
|
||||
perror(("mkstemp nodefile " + std::string(tmpname)).c_str());
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
unlink(tmpname.c_str());
|
||||
FILE *node_out;
|
||||
node_out = fdopen(nodefd, "w+b");
|
||||
if (node_out == NULL) {
|
||||
perror(tmpname.c_str());
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
|
||||
std::vector<FILE *> node_readers;
|
||||
for (size_t i = 0; i < CPUS; i++) {
|
||||
node_readers.push_back(readers[i].nodefile);
|
||||
rewind(readers[i].nodefile);
|
||||
}
|
||||
|
||||
fqsort(node_readers, sizeof(node), nodecmp, node_out, memsize / 20);
|
||||
|
||||
for (size_t i = 0; i < CPUS; i++) {
|
||||
if (fclose(readers[i].nodefile) != 0) {
|
||||
perror("fclose node");
|
||||
exit(EXIT_CLOSE);
|
||||
}
|
||||
}
|
||||
|
||||
rewind(node_out);
|
||||
|
||||
// scan
|
||||
|
||||
tmpname = std::string(tmpdir) + "/node3.XXXXXX";
|
||||
nodefd = mkstemp((char *) tmpname.c_str());
|
||||
if (nodefd < 0) {
|
||||
perror(("mkstemp nodefile " + std::string(tmpname)).c_str());
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
unlink(tmpname.c_str());
|
||||
shared_nodes = fdopen(nodefd, "w+b");
|
||||
if (shared_nodes == NULL) {
|
||||
perror(tmpname.c_str());
|
||||
exit(EXIT_OPEN);
|
||||
}
|
||||
|
||||
// `written` is to see if this node has already been preserved
|
||||
// and doesn't need to be preserved again
|
||||
struct node written;
|
||||
written.index = ULONG_MAX;
|
||||
|
||||
nodepos = 0;
|
||||
struct node here;
|
||||
while (fread((void *) &here, sizeof(here), 1, node_out)) {
|
||||
if (nodecmp((void *) &here, (void *) &written) != 0) {
|
||||
fwrite_check((void *) &here, sizeof(here), 1, shared_nodes, &nodepos, "shared nodes");
|
||||
written = here;
|
||||
|
||||
#if 0
|
||||
unsigned wx, wy;
|
||||
decode_quadkey(here.index, &wx, &wy);
|
||||
double lon, lat;
|
||||
tile2lonlat(wx, wy, 32, &lon, &lat);
|
||||
printf("{\"type\":\"Feature\", \"properties\":{}, \"geometry\":{\"type\":\"Point\", \"coordinates\":[%f,%f]}}\n", lon, lat);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
fflush(shared_nodes);
|
||||
|
||||
if (nodepos > 0) {
|
||||
shared_nodes_map = (node *) mmap(NULL, nodepos, PROT_READ, MAP_PRIVATE, nodefd, 0);
|
||||
if (shared_nodes_map == (node *) MAP_FAILED) {
|
||||
perror("mmap nodes");
|
||||
exit(EXIT_MEMORY);
|
||||
}
|
||||
}
|
||||
|
||||
fclose(node_out);
|
||||
}
|
||||
|
||||
if (!quiet) {
|
||||
fprintf(stderr, "Merging index \r");
|
||||
}
|
||||
|
||||
char indexname[strlen(tmpdir) + strlen("/index.XXXXXXXX") + 1];
|
||||
snprintf(indexname, sizeof(indexname), "%s%s", tmpdir, "/index.XXXXXXXX");
|
||||
|
||||
@@ -2022,7 +2249,9 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
long long s = progress_seq;
|
||||
long long geompos_print = geompos;
|
||||
long long poolpos_print = poolpos;
|
||||
fprintf(stderr, "%lld features, %lld bytes of geometry, %lld bytes of string pool\n", s, geompos_print, poolpos_print);
|
||||
long long vertexpos_print = vertexpos;
|
||||
long long nodepos_print = nodepos;
|
||||
fprintf(stderr, "%lld features, %lld bytes of geometry and attributes, %lld bytes of string pool, %lld bytes of vertices, %lld bytes of nodes\n", s, geompos_print, poolpos_print, vertexpos_print, nodepos_print);
|
||||
}
|
||||
|
||||
if (indexpos == 0) {
|
||||
@@ -2475,7 +2704,7 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
}
|
||||
}
|
||||
|
||||
std::sort(ddv.begin(), ddv.end());
|
||||
std::stable_sort(ddv.begin(), ddv.end());
|
||||
|
||||
size_t i = 0;
|
||||
for (int z = 0; z <= basezoom; z++) {
|
||||
@@ -2531,7 +2760,7 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
std::atomic<unsigned> midx(0);
|
||||
std::atomic<unsigned> midy(0);
|
||||
std::vector<strategy> strategies;
|
||||
int written = traverse_zooms(fd, size, stringpool, &midx, &midy, maxzoom, minzoom, outdb, outdir, buffer, fname, tmpdir, gamma, full_detail, low_detail, min_detail, pool_off, initial_x, initial_y, simplification, maxzoom_simplification, layermaps, prefilter, postfilter, attribute_accum, filter, strategies, iz);
|
||||
int written = traverse_zooms(fd, size, stringpool, &midx, &midy, maxzoom, minzoom, outdb, outdir, buffer, fname, tmpdir, gamma, full_detail, low_detail, min_detail, pool_off, initial_x, initial_y, simplification, maxzoom_simplification, layermaps, prefilter, postfilter, attribute_accum, filter, strategies, iz, shared_nodes_map, nodepos, basezoom, droprate, unidecode_data);
|
||||
|
||||
if (maxzoom != written) {
|
||||
if (written > minzoom) {
|
||||
@@ -2554,6 +2783,8 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
perror("close pool");
|
||||
}
|
||||
|
||||
fclose(shared_nodes);
|
||||
|
||||
// mbtiles-style bounding box and center
|
||||
double minlat = 0, minlon = 0, maxlat = 0, maxlon = 0, midlat = 0, midlon = 0;
|
||||
|
||||
@@ -2597,7 +2828,7 @@ std::pair<int, metadata> read_input(std::vector<source> &sources, char *fname, i
|
||||
ai->second.maxzoom = maxzoom;
|
||||
}
|
||||
|
||||
metadata m = make_metadata(fname, minzoom, maxzoom, minlat, minlon, maxlat, maxlon, minlat2, minlon2, maxlat2, maxlon2, midlat, midlon, attribution, merged_lm, true, description, !prevent[P_TILE_STATS], attribute_descriptions, "tippecanoe", commandline, strategies);
|
||||
metadata m = make_metadata(fname, minzoom, maxzoom, minlat, minlon, maxlat, maxlon, minlat2, minlon2, maxlat2, maxlon2, midlat, midlon, attribution, merged_lm, true, description, !prevent[P_TILE_STATS], attribute_descriptions, "tippecanoe", commandline, strategies, basezoom, droprate, retain_points_multiplier);
|
||||
if (outdb != NULL) {
|
||||
mbtiles_write_metadata(outdb, m, forcetable);
|
||||
} else {
|
||||
@@ -2617,7 +2848,7 @@ static bool has_name(struct option *long_options, int *pl) {
|
||||
return false;
|
||||
}
|
||||
|
||||
void set_attribute_type(std::map<std::string, int> &attribute_types, const char *arg) {
|
||||
void set_attribute_type(std::unordered_map<std::string, int> &attribute_types, const char *arg) {
|
||||
const char *s = strchr(arg, ':');
|
||||
if (s == NULL) {
|
||||
fprintf(stderr, "-T%s option must be in the form -Tname:type\n", arg);
|
||||
@@ -2644,79 +2875,6 @@ void set_attribute_type(std::map<std::string, int> &attribute_types, const char
|
||||
attribute_types.insert(std::pair<std::string, int>(name, t));
|
||||
}
|
||||
|
||||
void set_attribute_accum(std::map<std::string, attribute_op> &attribute_accum, std::string name, std::string type) {
|
||||
attribute_op t;
|
||||
|
||||
if (type == "sum") {
|
||||
t = op_sum;
|
||||
} else if (type == "product") {
|
||||
t = op_product;
|
||||
} else if (type == "mean") {
|
||||
t = op_mean;
|
||||
} else if (type == "max") {
|
||||
t = op_max;
|
||||
} else if (type == "min") {
|
||||
t = op_min;
|
||||
} else if (type == "concat") {
|
||||
t = op_concat;
|
||||
} else if (type == "comma") {
|
||||
t = op_comma;
|
||||
} else {
|
||||
fprintf(stderr, "Attribute method (%s) must be sum, product, mean, max, min, concat, or comma\n", type.c_str());
|
||||
exit(EXIT_ARGS);
|
||||
}
|
||||
|
||||
attribute_accum.insert(std::pair<std::string, attribute_op>(name, t));
|
||||
}
|
||||
|
||||
void set_attribute_accum(std::map<std::string, attribute_op> &attribute_accum, const char *arg) {
|
||||
if (*arg == '{') {
|
||||
json_pull *jp = json_begin_string(arg);
|
||||
json_object *o = json_read_tree(jp);
|
||||
|
||||
if (o == NULL) {
|
||||
fprintf(stderr, "%s: -E%s: %s\n", *av, arg, jp->error);
|
||||
exit(EXIT_JSON);
|
||||
}
|
||||
|
||||
if (o->type != JSON_HASH) {
|
||||
fprintf(stderr, "%s: -E%s: not a JSON object\n", *av, arg);
|
||||
exit(EXIT_JSON);
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < o->value.object.length; i++) {
|
||||
json_object *k = o->value.object.keys[i];
|
||||
json_object *v = o->value.object.values[i];
|
||||
|
||||
if (k->type != JSON_STRING) {
|
||||
fprintf(stderr, "%s: -E%s: key %zu not a string\n", *av, arg, i);
|
||||
exit(EXIT_JSON);
|
||||
}
|
||||
if (v->type != JSON_STRING) {
|
||||
fprintf(stderr, "%s: -E%s: value %zu not a string\n", *av, arg, i);
|
||||
exit(EXIT_JSON);
|
||||
}
|
||||
|
||||
set_attribute_accum(attribute_accum, k->value.string.string, v->value.string.string);
|
||||
}
|
||||
|
||||
json_free(o);
|
||||
json_end(jp);
|
||||
return;
|
||||
}
|
||||
|
||||
const char *s = strchr(arg, ':');
|
||||
if (s == NULL) {
|
||||
fprintf(stderr, "-E%s option must be in the form -Ename:method\n", arg);
|
||||
exit(EXIT_ARGS);
|
||||
}
|
||||
|
||||
std::string name = std::string(arg, s - arg);
|
||||
std::string type = std::string(s + 1);
|
||||
|
||||
set_attribute_accum(attribute_accum, name, type);
|
||||
}
|
||||
|
||||
void set_attribute_value(const char *arg) {
|
||||
if (*arg == '{') {
|
||||
json_pull *jp = json_begin_string(arg);
|
||||
@@ -2741,10 +2899,8 @@ void set_attribute_value(const char *arg) {
|
||||
exit(EXIT_JSON);
|
||||
}
|
||||
|
||||
serial_val val;
|
||||
stringify_value(v, val.type, val.s, "json", 1, o);
|
||||
|
||||
set_attributes.insert(std::pair<std::string, serial_val>(k->value.string.string, val));
|
||||
serial_val val = stringify_value(v, "json", 1, o);
|
||||
set_attributes.emplace(k->value.string.string, val);
|
||||
}
|
||||
|
||||
json_free(o);
|
||||
@@ -2850,8 +3006,8 @@ int main(int argc, char **argv) {
|
||||
bool guess_cluster_maxzoom = false;
|
||||
|
||||
std::set<std::string> exclude, include;
|
||||
std::map<std::string, int> attribute_types;
|
||||
std::map<std::string, attribute_op> attribute_accum;
|
||||
std::unordered_map<std::string, int> attribute_types;
|
||||
std::unordered_map<std::string, attribute_op> attribute_accum;
|
||||
std::map<std::string, std::string> attribute_descriptions;
|
||||
int exclude_all = 0;
|
||||
int read_parallel = 0;
|
||||
@@ -2892,6 +3048,7 @@ int main(int argc, char **argv) {
|
||||
{"minimum-zoom", required_argument, 0, 'Z'},
|
||||
{"smallest-maximum-zoom-guess", required_argument, 0, '~'},
|
||||
{"extend-zooms-if-still-dropping", no_argument, &additional[A_EXTEND_ZOOMS], 1},
|
||||
{"extend-zooms-if-still-dropping-maximum", required_argument, 0, '~'},
|
||||
{"one-tile", required_argument, 0, 'R'},
|
||||
|
||||
{"Tile resolution", 0, 0, 0},
|
||||
@@ -2918,9 +3075,11 @@ int main(int argc, char **argv) {
|
||||
{"Filtering features by attributes", 0, 0, 0},
|
||||
{"feature-filter-file", required_argument, 0, 'J'},
|
||||
{"feature-filter", required_argument, 0, 'j'},
|
||||
{"unidecode-data", required_argument, 0, '~'},
|
||||
|
||||
{"Dropping a fixed fraction of features by zoom level", 0, 0, 0},
|
||||
{"drop-rate", required_argument, 0, 'r'},
|
||||
{"retain-points-multiplier", required_argument, 0, '~'},
|
||||
{"base-zoom", required_argument, 0, 'B'},
|
||||
{"drop-denser", required_argument, 0, '~'},
|
||||
{"limit-base-zoom-to-maximum-zoom", no_argument, &prevent[P_BASEZOOM_ABOVE_MAXZOOM], 1},
|
||||
@@ -2950,6 +3109,7 @@ int main(int argc, char **argv) {
|
||||
{"simplify-only-low-zooms", no_argument, &prevent[P_SIMPLIFY_LOW], 1},
|
||||
{"simplification-at-maximum-zoom", required_argument, 0, '~'},
|
||||
{"no-tiny-polygon-reduction", no_argument, &prevent[P_TINY_POLYGON_REDUCTION], 1},
|
||||
{"no-tiny-polygon-reduction-at-maximum-zoom", no_argument, &prevent[P_TINY_POLYGON_REDUCTION_AT_MAXZOOM], 1},
|
||||
{"tiny-polygon-size", required_argument, 0, '~'},
|
||||
{"no-simplification-of-shared-nodes", no_argument, &prevent[P_SIMPLIFY_SHARED_NODES], 1},
|
||||
{"visvalingam", no_argument, &additional[A_VISVALINGAM], 1},
|
||||
@@ -3138,6 +3298,12 @@ int main(int argc, char **argv) {
|
||||
}
|
||||
} else if (strcmp(opt, "preserve-point-density-threshold") == 0) {
|
||||
preserve_point_density_threshold = atoll_require(optarg, "Preserve point density threshold");
|
||||
} else if (strcmp(opt, "extend-zooms-if-still-dropping-maximum") == 0) {
|
||||
extend_zooms_max = atoll_require(optarg, "Maximum number by which to extend zooms");
|
||||
} else if (strcmp(opt, "retain-points-multiplier") == 0) {
|
||||
retain_points_multiplier = atoll_require(optarg, "Multiply the fraction of points retained by zoom level");
|
||||
} else if (strcmp(opt, "unidecode-data") == 0) {
|
||||
unidecode_data = read_unidecode(optarg);
|
||||
} else {
|
||||
fprintf(stderr, "%s: Unrecognized option --%s\n", argv[0], opt);
|
||||
exit(EXIT_ARGS);
|
||||
@@ -3460,7 +3626,7 @@ int main(int argc, char **argv) {
|
||||
break;
|
||||
|
||||
case 'E':
|
||||
set_attribute_accum(attribute_accum, optarg);
|
||||
set_attribute_accum(attribute_accum, optarg, argv);
|
||||
break;
|
||||
|
||||
default: {
|
||||
@@ -3585,7 +3751,7 @@ int main(int argc, char **argv) {
|
||||
}
|
||||
}
|
||||
|
||||
if (extra_detail >= 0) {
|
||||
if (extra_detail >= 0 || prevent[P_SIMPLIFY_SHARED_NODES] || additional[A_EXTEND_ZOOMS] || extend_zooms_max > 0) {
|
||||
geometry_scale = 0;
|
||||
} else {
|
||||
geometry_scale = 32 - (full_detail + maxzoom);
|
||||
|
||||
@@ -61,6 +61,8 @@ extern int tiny_polygon_size;
|
||||
extern size_t limit_tile_feature_count;
|
||||
extern size_t limit_tile_feature_count_at_maxzoom;
|
||||
extern std::map<std::string, serial_val> set_attributes;
|
||||
extern long long extend_zooms_max;
|
||||
extern int retain_points_multiplier;
|
||||
|
||||
struct order_field {
|
||||
std::string name;
|
||||
|
||||
+35
-5
@@ -27,7 +27,15 @@ see the shape and relative popularity of every point of interest and every
|
||||
significant travel corridor.
|
||||
.SH Installation
|
||||
.PP
|
||||
For this fork you will need to build from the source repository:
|
||||
The easiest way to install tippecanoe on OSX is with Homebrew \[la]http://brew.sh/\[ra]:
|
||||
.PP
|
||||
.RS
|
||||
.nf
|
||||
$ brew install tippecanoe
|
||||
.fi
|
||||
.RE
|
||||
.PP
|
||||
On Ubuntu it will usually be easiest to build from the source repository:
|
||||
.PP
|
||||
.RS
|
||||
.nf
|
||||
@@ -50,7 +58,7 @@ $ tippecanoe \-o file.mbtiles [options] [file.json file.json.gz file.fgb ...]
|
||||
.RE
|
||||
.PP
|
||||
If no files are specified, it reads GeoJSON from the standard input.
|
||||
If multiple files are specified, each is placed in its own layer.
|
||||
If multiple files are specified, each is placed in its own layer \[la]#input-files-and-layer-names\[ra]\&.
|
||||
.PP
|
||||
The GeoJSON features need not be wrapped in a FeatureCollection.
|
||||
You can concatenate multiple GeoJSON features or files together,
|
||||
@@ -403,6 +411,9 @@ Parallel processing will also be automatic if the input file is in FlatGeobuf fo
|
||||
The detail and simplification options that ordinarily apply only to the maximum zoom level will apply both to the originally
|
||||
specified maximum zoom and to any levels added beyond that.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-\-extend\-zooms\-if\-still\-dropping\-maximum=\fR\fIcount\fP: Increase the maxzoom if features are still being dropped at that zoom level
|
||||
by up to \fIcount\fP zoom levels.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-R\fR \fIzoom\fP\fB\fC/\fR\fIx\fP\fB\fC/\fR\fIy\fP or \fB\fC\-\-one\-tile=\fR\fIzoom\fP\fB\fC/\fR\fIx\fP\fB\fC/\fR\fIy\fP: Set the minzoom and maxzoom to \fIzoom\fP and produce only
|
||||
the single specified tile at that zoom level.
|
||||
.RE
|
||||
@@ -519,7 +530,7 @@ The attributes and values may also be specified as JSON keys and values: \fB\fC\
|
||||
.SS Filtering features by attributes
|
||||
.RS
|
||||
.IP \(bu 2
|
||||
\fB\fC\-j\fR \fIfilter\fP or \fB\fC\-\-feature\-filter\fR=\fIfilter\fP: Check features against a per\-layer filter (as defined in the Mapbox GL Style Specification \[la]https://docs.mapbox.com/mapbox-gl-js/style-spec/#other-filter\[ra]) and only include those that match. Any features in layers that have no filter specified will be passed through. Filters for the layer \fB\fC"*"\fR apply to all layers. The special variable \fB\fC$zoom\fR refers to the current zoom level.
|
||||
\fB\fC\-j\fR \fIfilter\fP or \fB\fC\-\-feature\-filter\fR=\fIfilter\fP: Check features against a per\-layer filter (as defined in the Mapbox GL Style Specification \[la]https://docs.mapbox.com/mapbox-gl-js/style-spec/#other-filter\[ra] or in a Felt filter specification still to be finalized) and only include those that match. Any features in layers that have no filter specified will be passed through. Filters for the layer \fB\fC"*"\fR apply to all layers. The special variable \fB\fC$zoom\fR refers to the current zoom level.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-J\fR \fIfilter\-file\fP or \fB\fC\-\-feature\-filter\-file\fR=\fIfilter\-file\fP: Like \fB\fC\-j\fR, but read the filter from a file.
|
||||
.RE
|
||||
@@ -567,6 +578,8 @@ If you use \fB\fC\-Bg\fR, it will guess a zoom level that will keep at most 50,0
|
||||
You can also specify a marker\-width with \fB\fC\-Bg\fR\fIwidth\fP to allow fewer features in the densest tile to
|
||||
compensate for the larger marker, or \fB\fC\-Bf\fR\fInumber\fP to allow at most \fInumber\fP features in the densest tile.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-\-retain\-points\-multiplier=\fR\fImultiple\fP: Retain the specified multiple of points instead of just the number of points that would ordinarily be retained by the drop rate. These can be thinned out later with the \fB\fC\-m\fR option to \fB\fCtippecanoe\-overzoom\fR\&. The start of each cluster is marked in the feature sequence by the \fB\fCtippecanoe:retain_points_multiplier_first\fR attribute. The \fB\fC\-\-tile\-size\-limit\fR will also be extended at low zoom levels to allow for the multiplied features.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-\-drop\-denser=\fR\fIpercentage\fP: When dropping dots at zoom levels below the base zoom, give the specified \fIpercentage\fP
|
||||
preference to retaining points in sparse areas and dropping points in dense areas.
|
||||
.IP \(bu 2
|
||||
@@ -622,10 +635,12 @@ the line or polygon within one tile unit of its proper location. You can probabl
|
||||
.IP \(bu 2
|
||||
\fB\fC\-\-simplification\-at\-maximum\-zoom=\fR\fIscale\fP: Use the specified \fIscale\fP at maxzoom instead of the standard simplification scale (which still applies at lower zooms)
|
||||
.IP \(bu 2
|
||||
\fB\fC\-pn\fR or \fB\fC\-\-no\-simplification\-of\-shared\-nodes\fR: Don't simplify away nodes that appear in more than one feature or are used multiple times within the same feature, so that the intersection node will not be lost from intersecting roads. (This will not be effective if you also use \fB\fC\-\-coalesce\fR or \fB\fC\-\-detect\-shared\-borders\fR\&.)
|
||||
\fB\fC\-pn\fR or \fB\fC\-\-no\-simplification\-of\-shared\-nodes\fR: Don't simplify away nodes at which LineStrings or Polygon rings converge, diverge, or cross. (This will not be effective if you also use \fB\fC\-\-coalesce\fR\&.) In between intersection nodes, LineString segments or polygon edges will be simplified identically in each feature if possible. Use this instead of \fB\fC\-\-detect\-shared\-borders\fR\&.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-pt\fR or \fB\fC\-\-no\-tiny\-polygon\-reduction\fR: Don't combine the area of very small polygons into small squares that represent their combined area.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-pT\fR or \fB\fC\-\-no\-tiny\-polygon\-reduction\-at\-maximum\-zoom\fR: Combine the area of very small polygons into small squares that represent their combined area only at zoom levels below the maximum.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-\-tiny\-polygon\-size=\fR\fIsize\fP: Use the specified \fIsize\fP for tiny polygons instead of the default 2. Anything above 6 or so will lead to visible artifacts with the default tile detail.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-av\fR or \fB\fC\-\-visvalingam\fR: Use Visvalingam's simplification algorithm rather than Douglas\-Peucker's.
|
||||
@@ -633,7 +648,7 @@ the line or polygon within one tile unit of its proper location. You can probabl
|
||||
.SS Attempts to improve shared polygon boundaries
|
||||
.RS
|
||||
.IP \(bu 2
|
||||
\fB\fC\-ab\fR or \fB\fC\-\-detect\-shared\-borders\fR: In the manner of TopoJSON \[la]https://github.com/mbostock/topojson/wiki/Introduction\[ra], detect borders that are shared between multiple polygons and simplify them identically in each polygon. This takes more time and memory than considering each polygon individually.
|
||||
\fB\fC\-ab\fR or \fB\fC\-\-detect\-shared\-borders\fR: DEPRECATED. In the manner of TopoJSON \[la]https://github.com/mbostock/topojson/wiki/Introduction\[ra], detect borders that are shared between multiple polygons and simplify them identically in each polygon. This takes more time and memory than considering each polygon individually. Use \fB\fCno\-simplification\-of\-shared\-nodes\fR instead, which is faster and more correct.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-aL\fR or \fB\fC\-\-grid\-low\-zooms\fR: At all zoom levels below \fImaxzoom\fP, snap all lines and polygons to a stairstep grid instead of allowing diagonals. You will also want to specify a tile resolution, probably \fB\fC\-D8\fR\&. This option provides a way to display continuous parcel, gridded, or binned data at low zooms without overwhelming the tiles with tiny polygons, since features will either get stretched out to the grid unit or lost entirely, depending on how they happened to be aligned in the original data. You probably don't want to use this.
|
||||
.RE
|
||||
@@ -965,6 +980,13 @@ The options are:
|
||||
.IP \(bu 2
|
||||
\fB\fC\-r\fR or \fB\fC\-\-read\-from\fR: list of input mbtiles to read from.
|
||||
.RE
|
||||
.SS Overzooming
|
||||
.RS
|
||||
.IP \(bu 2
|
||||
\fB\fC\-\-overzoom\fR: If one of the source tilesets has a larger maxzoom than the others, scale up tiles from the tilesets with the lower maxzooms so they will all have the same maxzoom in the output tileset.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-\-buffer=\fR\fIpixels\fP or \fB\fC\-b\fR \fIpixels\fP: Set the size of the tile buffer in the overzoomed tiles.
|
||||
.RE
|
||||
.SS Tileset description and attribution
|
||||
.RS
|
||||
.IP \(bu 2
|
||||
@@ -1244,4 +1266,12 @@ reads tile \fB\fCinz/inx/iny\fR of \fB\fCin.mvt.gz\fR and produces tile \fB\fCou
|
||||
\fB\fC\-d\fR \fIdetail\fP: Set the detail of the output tile (default 12)
|
||||
.IP \(bu 2
|
||||
\fB\fC\-y\fR \fIattribute\fP: Retain the specified \fIattribute\fP in the output features. All attributes that are not named in a \fB\fC\-y\fR option will be removed.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-j\fR \fIfilter\fP: Filter features using the same expression syntax as in tippecanoe.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-m\fR: If a tile was created with the \fB\fC\-\-retain\-points\-multiplier\fR option, thin the tile back down to its normal feature count during overzooming. The first feature from each cluster will be retained, unless \fB\fC\-j\fR is used to specify a filter, in which case the first matching filter from each cluster will be retained instead.
|
||||
.IP \(bu 2
|
||||
\fB\fC\-\-preserve\-input\-order\fR: Restore a set of filtered features to its original input order
|
||||
.IP \(bu 2
|
||||
\fB\fC\-\-accumulate\-attribute\fR: Behaves as in \fB\fCtippecanoe\fR to sum attributes from the features of a multiplier cluster that are not included in the final output. The attributes from features that are filtered away with \fB\fC\-j\fR are \fInot\fP accumulated onto the output feature.
|
||||
.RE
|
||||
|
||||
+97
-71
@@ -7,6 +7,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sqlite3.h>
|
||||
#include <cmath>
|
||||
#include <climits>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <set>
|
||||
@@ -100,16 +102,7 @@ sqlite3 *mbtiles_open(char *dbname, char **argv, int forcetable) {
|
||||
}
|
||||
|
||||
void mbtiles_write_tile(sqlite3 *outdb, int z, int tx, int ty, const char *data, int size) {
|
||||
// Store tiles by a hash of their contents (fnv1a 64-bit)
|
||||
// http://www.isthe.com/chongo/tech/comp/fnv/
|
||||
const unsigned long long fnv_offset_basis = 14695981039346656037u;
|
||||
const unsigned long long fnv_prime = 1099511628211u;
|
||||
unsigned long long h = fnv_offset_basis;
|
||||
for (int i = 0; i < size; i++) {
|
||||
h ^= (unsigned char) data[i];
|
||||
h *= fnv_prime;
|
||||
}
|
||||
std::string hash = std::to_string(h);
|
||||
std::string hash = std::to_string(fnv1a(std::string(data, size)));
|
||||
|
||||
// following https://github.com/mapbox/node-mbtiles/blob/master/lib/mbtiles.js
|
||||
|
||||
@@ -190,21 +183,21 @@ void mbtiles_erase_zoom(sqlite3 *outdb, int z) {
|
||||
}
|
||||
}
|
||||
|
||||
bool type_and_string::operator<(const type_and_string &o) const {
|
||||
if (string < o.string) {
|
||||
bool serial_val::operator<(const serial_val &o) const {
|
||||
if (s < o.s) {
|
||||
return true;
|
||||
}
|
||||
if (string == o.string && type < o.type) {
|
||||
if (s == o.s && type < o.type) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool type_and_string::operator!=(const type_and_string &o) const {
|
||||
bool serial_val::operator!=(const serial_val &o) const {
|
||||
if (type != o.type) {
|
||||
return true;
|
||||
}
|
||||
if (string != o.string) {
|
||||
if (s != o.s) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -255,7 +248,7 @@ void tilestats(std::map<std::string, layermap_entry> const &layermap1, size_t el
|
||||
state.nospace = true;
|
||||
state.json_write_string(geomtype);
|
||||
|
||||
size_t attrib_count = layer.second.file_keys.size();
|
||||
size_t attrib_count = layer.second.tilestats.size();
|
||||
if (attrib_count > max_tilestats_attributes) {
|
||||
attrib_count = max_tilestats_attributes;
|
||||
}
|
||||
@@ -271,7 +264,7 @@ void tilestats(std::map<std::string, layermap_entry> const &layermap1, size_t el
|
||||
state.json_write_array();
|
||||
|
||||
size_t attrs = 0;
|
||||
for (auto attribute : layer.second.file_keys) {
|
||||
for (auto attribute : layer.second.tilestats) {
|
||||
if (attrs == elements) {
|
||||
break;
|
||||
}
|
||||
@@ -332,15 +325,15 @@ void tilestats(std::map<std::string, layermap_entry> const &layermap1, size_t el
|
||||
vals++;
|
||||
|
||||
state.nospace = true;
|
||||
state.json_write_stringified(value.string);
|
||||
state.json_write_stringified(value.s);
|
||||
} else {
|
||||
std::string trunc = truncate16(value.string, 256);
|
||||
std::string trunc = truncate16(value.s, 256);
|
||||
|
||||
if (trunc.size() == value.string.size()) {
|
||||
if (trunc.size() == value.s.size()) {
|
||||
vals++;
|
||||
|
||||
state.nospace = true;
|
||||
state.json_write_string(value.string);
|
||||
state.json_write_string(value.s);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -597,6 +590,17 @@ void mbtiles_write_metadata(sqlite3 *db, const metadata &m, bool forcetable) {
|
||||
sqlite3_free(sql);
|
||||
}
|
||||
|
||||
if (m.decisions_json.size() > 0) {
|
||||
sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES ('tippecanoe_decisions', %Q);", m.decisions_json.c_str());
|
||||
if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) {
|
||||
fprintf(stderr, "set decisions: %s\n", err);
|
||||
if (!forcetable) {
|
||||
exit(EXIT_SQLITE);
|
||||
}
|
||||
}
|
||||
sqlite3_free(sql);
|
||||
}
|
||||
|
||||
if (m.vector_layers_json.size() > 0 || m.tilestats_json.size() > 0) {
|
||||
std::string json;
|
||||
json_writer state(&json);
|
||||
@@ -638,7 +642,11 @@ void mbtiles_write_metadata(sqlite3 *db, const metadata &m, bool forcetable) {
|
||||
}
|
||||
}
|
||||
|
||||
metadata make_metadata(const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double minlat2, double minlon2, double maxlat2, double maxlon2, double midlat, double midlon, const char *attribution, std::map<std::string, layermap_entry> const &layermap, bool vector, const char *description, bool do_tilestats, std::map<std::string, std::string> const &attribute_descriptions, std::string const &program, std::string const &commandline, std::vector<strategy> const &strategies) {
|
||||
static double sixdig(double val) {
|
||||
return std::round(val * 1e6) / 1e6;
|
||||
}
|
||||
|
||||
metadata make_metadata(const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double minlat2, double minlon2, double maxlat2, double maxlon2, double midlat, double midlon, const char *attribution, std::map<std::string, layermap_entry> const &layermap, bool vector, const char *description, bool do_tilestats, std::map<std::string, std::string> const &attribute_descriptions, std::string const &program, std::string const &commandline, std::vector<strategy> const &strategies, int basezoom, double droprate, int retain_points_multiplier) {
|
||||
metadata m;
|
||||
|
||||
m.name = fname;
|
||||
@@ -650,18 +658,18 @@ metadata make_metadata(const char *fname, int minzoom, int maxzoom, double minla
|
||||
m.minzoom = minzoom;
|
||||
m.maxzoom = maxzoom;
|
||||
|
||||
m.minlat = minlat;
|
||||
m.minlon = minlon;
|
||||
m.maxlat = maxlat;
|
||||
m.maxlon = maxlon;
|
||||
m.minlat = sixdig(minlat);
|
||||
m.minlon = sixdig(minlon);
|
||||
m.maxlat = sixdig(maxlat);
|
||||
m.maxlon = sixdig(maxlon);
|
||||
|
||||
m.minlat2 = minlat2;
|
||||
m.minlon2 = minlon2;
|
||||
m.maxlat2 = maxlat2;
|
||||
m.maxlon2 = maxlon2;
|
||||
m.minlat2 = sixdig(minlat2);
|
||||
m.minlon2 = sixdig(minlon2);
|
||||
m.maxlat2 = sixdig(maxlat2);
|
||||
m.maxlon2 = sixdig(maxlon2);
|
||||
|
||||
m.center_lat = midlat;
|
||||
m.center_lon = midlon;
|
||||
m.center_lat = sixdig(midlat);
|
||||
m.center_lon = sixdig(midlon);
|
||||
m.center_z = maxzoom;
|
||||
|
||||
if (attribution != NULL) {
|
||||
@@ -673,6 +681,17 @@ metadata make_metadata(const char *fname, int minzoom, int maxzoom, double minla
|
||||
|
||||
m.strategies_json = stringify_strategies(strategies);
|
||||
|
||||
if (isinf(droprate)) {
|
||||
droprate = LLONG_MAX;
|
||||
}
|
||||
if (basezoom != maxzoom || droprate != 2.5 || retain_points_multiplier != 1) {
|
||||
m.decisions_json = std::string("{") +
|
||||
"\"basezoom\":" + milo::dtoa_milo(basezoom) + "," +
|
||||
"\"droprate\":" + milo::dtoa_milo(droprate) + "," +
|
||||
"\"retain_points_multiplier\":" + std::to_string(retain_points_multiplier) +
|
||||
std::string("}");
|
||||
}
|
||||
|
||||
if (vector) {
|
||||
{
|
||||
json_writer state(&m.vector_layers_json);
|
||||
@@ -686,7 +705,7 @@ metadata make_metadata(const char *fname, int minzoom, int maxzoom, double minla
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < lnames.size(); i++) {
|
||||
auto fk = layermap.find(lnames[i]);
|
||||
auto ts = layermap.find(lnames[i]);
|
||||
state.nospace = true;
|
||||
state.json_write_hash();
|
||||
|
||||
@@ -698,17 +717,17 @@ metadata make_metadata(const char *fname, int minzoom, int maxzoom, double minla
|
||||
state.nospace = true;
|
||||
state.json_write_string("description");
|
||||
state.nospace = true;
|
||||
state.json_write_string(fk->second.description);
|
||||
state.json_write_string(ts->second.description);
|
||||
|
||||
state.nospace = true;
|
||||
state.json_write_string("minzoom");
|
||||
state.nospace = true;
|
||||
state.json_write_signed(fk->second.minzoom);
|
||||
state.json_write_signed(ts->second.minzoom);
|
||||
|
||||
state.nospace = true;
|
||||
state.json_write_string("maxzoom");
|
||||
state.nospace = true;
|
||||
state.json_write_signed(fk->second.maxzoom);
|
||||
state.json_write_signed(ts->second.maxzoom);
|
||||
|
||||
state.nospace = true;
|
||||
state.json_write_string("fields");
|
||||
@@ -717,7 +736,7 @@ metadata make_metadata(const char *fname, int minzoom, int maxzoom, double minla
|
||||
|
||||
bool first = true;
|
||||
size_t attribute_count = 0;
|
||||
for (auto j = fk->second.file_keys.begin(); j != fk->second.file_keys.end(); ++j) {
|
||||
for (auto j = ts->second.tilestats.begin(); j != ts->second.tilestats.end(); ++j) {
|
||||
if (first) {
|
||||
first = false;
|
||||
}
|
||||
@@ -824,35 +843,35 @@ std::map<std::string, layermap_entry> merge_layermaps(std::vector<std::map<std::
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
for (auto fk = map->second.file_keys.begin(); fk != map->second.file_keys.end(); ++fk) {
|
||||
std::string attribname = fk->first;
|
||||
for (auto ts = map->second.tilestats.begin(); ts != map->second.tilestats.end(); ++ts) {
|
||||
std::string attribname = ts->first;
|
||||
if (trunc) {
|
||||
attribname = truncate16(attribname, 256);
|
||||
}
|
||||
|
||||
auto fk2 = out_entry->second.file_keys.find(attribname);
|
||||
auto ts2 = out_entry->second.tilestats.find(attribname);
|
||||
|
||||
if (fk2 == out_entry->second.file_keys.end()) {
|
||||
out_entry->second.file_keys.insert(std::pair<std::string, type_and_string_stats>(attribname, fk->second));
|
||||
if (ts2 == out_entry->second.tilestats.end()) {
|
||||
out_entry->second.tilestats.insert(std::pair<std::string, tilestat>(attribname, ts->second));
|
||||
} else {
|
||||
for (auto val : fk->second.sample_values) {
|
||||
auto pt = std::lower_bound(fk2->second.sample_values.begin(), fk2->second.sample_values.end(), val);
|
||||
if (pt == fk2->second.sample_values.end() || *pt != val) { // not found
|
||||
fk2->second.sample_values.insert(pt, val);
|
||||
for (auto val : ts->second.sample_values) {
|
||||
auto pt = std::lower_bound(ts2->second.sample_values.begin(), ts2->second.sample_values.end(), val);
|
||||
if (pt == ts2->second.sample_values.end() || *pt != val) { // not found
|
||||
ts2->second.sample_values.insert(pt, val);
|
||||
|
||||
if (fk2->second.sample_values.size() > max_tilestats_sample_values) {
|
||||
fk2->second.sample_values.pop_back();
|
||||
if (ts2->second.sample_values.size() > max_tilestats_sample_values) {
|
||||
ts2->second.sample_values.pop_back();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fk2->second.type |= fk->second.type;
|
||||
ts2->second.type |= ts->second.type;
|
||||
|
||||
if (fk->second.min < fk2->second.min) {
|
||||
fk2->second.min = fk->second.min;
|
||||
if (ts->second.min < ts2->second.min) {
|
||||
ts2->second.min = ts->second.min;
|
||||
}
|
||||
if (fk->second.max > fk2->second.max) {
|
||||
fk2->second.max = fk->second.max;
|
||||
if (ts->second.max > ts2->second.max) {
|
||||
ts2->second.max = ts->second.max;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -873,41 +892,48 @@ std::map<std::string, layermap_entry> merge_layermaps(std::vector<std::map<std::
|
||||
return out;
|
||||
}
|
||||
|
||||
void add_to_file_keys(std::map<std::string, type_and_string_stats> &file_keys, std::string const &attrib, type_and_string const &val) {
|
||||
void add_to_tilestats(std::map<std::string, tilestat> &tilestats, std::string const &attrib, serial_val const &val) {
|
||||
if (val.type == mvt_null) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto fka = file_keys.find(attrib);
|
||||
if (fka == file_keys.end()) {
|
||||
file_keys.insert(std::pair<std::string, type_and_string_stats>(attrib, type_and_string_stats()));
|
||||
fka = file_keys.find(attrib);
|
||||
auto tsa = tilestats.find(attrib);
|
||||
if (tsa == tilestats.end()) {
|
||||
tilestats.insert(std::pair<std::string, tilestat>(attrib, tilestat()));
|
||||
tsa = tilestats.find(attrib);
|
||||
}
|
||||
|
||||
if (fka == file_keys.end()) {
|
||||
if (tsa == tilestats.end()) {
|
||||
fprintf(stderr, "Can't happen (tilestats)\n");
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
if (val.type == mvt_double) {
|
||||
double d = atof(val.string.c_str());
|
||||
double d = atof(val.s.c_str());
|
||||
|
||||
if (d < fka->second.min) {
|
||||
fka->second.min = d;
|
||||
if (d < tsa->second.min) {
|
||||
tsa->second.min = d;
|
||||
}
|
||||
if (d > fka->second.max) {
|
||||
fka->second.max = d;
|
||||
if (d > tsa->second.max) {
|
||||
tsa->second.max = d;
|
||||
}
|
||||
}
|
||||
|
||||
auto pt = std::lower_bound(fka->second.sample_values.begin(), fka->second.sample_values.end(), val);
|
||||
if (pt == fka->second.sample_values.end() || *pt != val) { // not found
|
||||
fka->second.sample_values.insert(pt, val);
|
||||
|
||||
if (fka->second.sample_values.size() > max_tilestats_sample_values) {
|
||||
fka->second.sample_values.pop_back();
|
||||
auto pt = std::lower_bound(tsa->second.sample_values.begin(), tsa->second.sample_values.end(), val);
|
||||
if (pt == tsa->second.sample_values.end() || *pt != val) { // not found
|
||||
if (tsa->second.sample_values.size() >= max_tilestats_sample_values) {
|
||||
if (pt == tsa->second.sample_values.end()) {
|
||||
// insertion point would be at the end,
|
||||
// and the list is already full, so do nothing
|
||||
} else {
|
||||
// bump the former last value, insert this one
|
||||
tsa->second.sample_values.insert(pt, val);
|
||||
tsa->second.sample_values.pop_back();
|
||||
}
|
||||
} else {
|
||||
tsa->second.sample_values.insert(pt, val);
|
||||
}
|
||||
}
|
||||
|
||||
fka->second.type |= (1 << val.type);
|
||||
tsa->second.type |= (1 << val.type);
|
||||
}
|
||||
|
||||
+6
-13
@@ -9,16 +9,8 @@ extern size_t max_tilestats_attributes;
|
||||
extern size_t max_tilestats_sample_values;
|
||||
extern size_t max_tilestats_values;
|
||||
|
||||
struct type_and_string {
|
||||
int type = 0;
|
||||
std::string string = "";
|
||||
|
||||
bool operator<(const type_and_string &o) const;
|
||||
bool operator!=(const type_and_string &o) const;
|
||||
};
|
||||
|
||||
struct type_and_string_stats {
|
||||
std::vector<type_and_string> sample_values = std::vector<type_and_string>(); // sorted
|
||||
struct tilestat {
|
||||
std::vector<serial_val> sample_values = std::vector<serial_val>(); // sorted
|
||||
double min = INFINITY;
|
||||
double max = -INFINITY;
|
||||
int type = 0;
|
||||
@@ -26,7 +18,7 @@ struct type_and_string_stats {
|
||||
|
||||
struct layermap_entry {
|
||||
size_t id = 0;
|
||||
std::map<std::string, type_and_string_stats> file_keys{};
|
||||
std::map<std::string, tilestat> tilestats{};
|
||||
int minzoom = 0;
|
||||
int maxzoom = 0;
|
||||
std::string description = "";
|
||||
@@ -66,6 +58,7 @@ struct metadata {
|
||||
|
||||
std::string vector_layers_json;
|
||||
std::string tilestats_json;
|
||||
std::string decisions_json;
|
||||
};
|
||||
|
||||
#include "tile.hpp"
|
||||
@@ -75,7 +68,7 @@ sqlite3 *mbtiles_open(char *dbname, char **argv, int forcetable);
|
||||
void mbtiles_write_tile(sqlite3 *outdb, int z, int tx, int ty, const char *data, int size);
|
||||
void mbtiles_erase_zoom(sqlite3 *outdb, int z);
|
||||
|
||||
metadata make_metadata(const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double minlat2, double minlon2, double maxlat2, double maxlon2, double midlat, double midlon, const char *attribution, std::map<std::string, layermap_entry> const &layermap, bool vector, const char *description, bool do_tilestats, std::map<std::string, std::string> const &attribute_descriptions, std::string const &program, std::string const &commandline, std::vector<strategy> const &strategies);
|
||||
metadata make_metadata(const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double minlat2, double minlon2, double maxlat2, double maxlon2, double midlat, double midlon, const char *attribution, std::map<std::string, layermap_entry> const &layermap, bool vector, const char *description, bool do_tilestats, std::map<std::string, std::string> const &attribute_descriptions, std::string const &program, std::string const &commandline, std::vector<strategy> const &strategies, int basezoom, double droprate, int retain_points_multiplier);
|
||||
void mbtiles_write_metadata(sqlite3 *db, const metadata &m, bool forcetable);
|
||||
|
||||
void mbtiles_close(sqlite3 *outdb, const char *pgm);
|
||||
@@ -83,6 +76,6 @@ void mbtiles_close(sqlite3 *outdb, const char *pgm);
|
||||
std::map<std::string, layermap_entry> merge_layermaps(std::vector<std::map<std::string, layermap_entry> > const &maps);
|
||||
std::map<std::string, layermap_entry> merge_layermaps(std::vector<std::map<std::string, layermap_entry> > const &maps, bool trunc);
|
||||
|
||||
void add_to_file_keys(std::map<std::string, type_and_string_stats> &file_keys, std::string const &layername, type_and_string const &val);
|
||||
void add_to_tilestats(std::map<std::string, tilestat> &tilestats, std::string const &layername, serial_val const &val);
|
||||
|
||||
#endif
|
||||
|
||||
+3
-1
@@ -49,10 +49,11 @@ int memfile_close(struct memfile *file) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int memfile_write(struct memfile *file, void *s, long long len) {
|
||||
int memfile_write(struct memfile *file, void *s, long long len, bool &in_memory) {
|
||||
// If it is full, append to the file.
|
||||
// If it is not full yet, append to the string in memory.
|
||||
|
||||
in_memory = false;
|
||||
if (file->fp != NULL) {
|
||||
if (fwrite(s, sizeof(char), len, file->fp) != (size_t) len) {
|
||||
return 0;
|
||||
@@ -61,6 +62,7 @@ int memfile_write(struct memfile *file, void *s, long long len) {
|
||||
} else {
|
||||
file->map.append(std::string((char *) s, len));
|
||||
file->off += len;
|
||||
in_memory = true;
|
||||
}
|
||||
|
||||
return len;
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ struct memfile {
|
||||
|
||||
struct memfile *memfile_open(int fd);
|
||||
int memfile_close(struct memfile *file);
|
||||
int memfile_write(struct memfile *file, void *s, long long len);
|
||||
int memfile_write(struct memfile *file, void *s, long long len, bool &in_memory);
|
||||
void memfile_full(struct memfile *file);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
#include "protozero/pbf_writer.hpp"
|
||||
#include "milo/dtoa_milo.h"
|
||||
#include "errors.hpp"
|
||||
#include "serial.hpp"
|
||||
#include "text.hpp"
|
||||
|
||||
mvt_geometry::mvt_geometry(int nop, long long nx, long long ny) {
|
||||
this->op = nop;
|
||||
@@ -89,7 +91,7 @@ int compress(std::string const &input, std::string &output, bool gz) {
|
||||
deflate_s.opaque = Z_NULL;
|
||||
deflate_s.avail_in = 0;
|
||||
deflate_s.next_in = Z_NULL;
|
||||
deflateInit2(&deflate_s, Z_BEST_COMPRESSION, Z_DEFLATED, gz ? 31 : 15, 8, Z_DEFAULT_STRATEGY);
|
||||
deflateInit2(&deflate_s, Z_DEFAULT_COMPRESSION, Z_DEFLATED, gz ? 31 : 15, 8, Z_DEFAULT_STRATEGY);
|
||||
deflate_s.next_in = (Bytef *) input.data();
|
||||
deflate_s.avail_in = input.size();
|
||||
size_t length = 0;
|
||||
@@ -109,7 +111,7 @@ int compress(std::string const &input, std::string &output, bool gz) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool mvt_tile::decode(std::string &message, bool &was_compressed) {
|
||||
bool mvt_tile::decode(const std::string &message, bool &was_compressed) {
|
||||
layers.clear();
|
||||
std::string src;
|
||||
|
||||
@@ -126,6 +128,7 @@ bool mvt_tile::decode(std::string &message, bool &was_compressed) {
|
||||
}
|
||||
|
||||
protozero::pbf_reader reader(src);
|
||||
std::shared_ptr<std::string> string_pool = std::make_shared<std::string>();
|
||||
|
||||
while (reader.next()) {
|
||||
switch (reader.tag()) {
|
||||
@@ -156,7 +159,12 @@ bool mvt_tile::decode(std::string &message, bool &was_compressed) {
|
||||
switch (value_reader.tag()) {
|
||||
case 1: /* string */
|
||||
value.type = mvt_string;
|
||||
value.string_value = value_reader.get_string();
|
||||
value.s = string_pool;
|
||||
{
|
||||
auto v = value_reader.get_view();
|
||||
std::string_view sv(v.data(), v.size());
|
||||
value.set_string_value(sv);
|
||||
}
|
||||
break;
|
||||
|
||||
case 2: /* float */
|
||||
@@ -195,7 +203,7 @@ bool mvt_tile::decode(std::string &message, bool &was_compressed) {
|
||||
}
|
||||
}
|
||||
|
||||
layer.values.push_back(value);
|
||||
layer.values.push_back(std::move(value));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -223,6 +231,7 @@ bool mvt_tile::decode(std::string &message, bool &was_compressed) {
|
||||
case 2: /* tag */
|
||||
{
|
||||
auto pi = feature_reader.get_packed_uint32();
|
||||
feature.tags.reserve(std::distance(pi.first, pi.second));
|
||||
for (auto it = pi.first; it != pi.second; ++it) {
|
||||
feature.tags.push_back(*it);
|
||||
}
|
||||
@@ -236,6 +245,7 @@ bool mvt_tile::decode(std::string &message, bool &was_compressed) {
|
||||
case 4: /* geometry */
|
||||
{
|
||||
auto pi = feature_reader.get_packed_uint32();
|
||||
geoms.reserve(std::distance(pi.first, pi.second));
|
||||
for (auto it = pi.first; it != pi.second; ++it) {
|
||||
geoms.push_back(*it);
|
||||
}
|
||||
@@ -249,6 +259,7 @@ bool mvt_tile::decode(std::string &message, bool &was_compressed) {
|
||||
}
|
||||
|
||||
long long px = 0, py = 0;
|
||||
feature.geometry.reserve(geoms.size()); // probably not quite right, but still plausible
|
||||
for (size_t g = 0; g < geoms.size(); g++) {
|
||||
uint32_t geom = geoms[g];
|
||||
uint32_t op = geom & 7;
|
||||
@@ -260,14 +271,14 @@ bool mvt_tile::decode(std::string &message, bool &was_compressed) {
|
||||
py += protozero::decode_zigzag32(geoms[g + 2]);
|
||||
g += 2;
|
||||
|
||||
feature.geometry.push_back(mvt_geometry(op, px, py));
|
||||
feature.geometry.emplace_back(op, px, py);
|
||||
}
|
||||
} else {
|
||||
feature.geometry.push_back(mvt_geometry(op, 0, 0));
|
||||
feature.geometry.emplace_back(op, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
layer.features.push_back(feature);
|
||||
layer.features.push_back(std::move(feature));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -277,14 +288,7 @@ bool mvt_tile::decode(std::string &message, bool &was_compressed) {
|
||||
}
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < layer.keys.size(); i++) {
|
||||
layer.key_map.insert(std::pair<std::string, size_t>(layer.keys[i], i));
|
||||
}
|
||||
for (size_t i = 0; i < layer.values.size(); i++) {
|
||||
layer.value_map.insert(std::pair<mvt_value, size_t>(layer.values[i], i));
|
||||
}
|
||||
|
||||
layers.push_back(layer);
|
||||
layers.push_back(std::move(layer));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -304,15 +308,18 @@ struct sorted_value {
|
||||
bool operator<(const sorted_value &sv) const {
|
||||
if (val < sv.val) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
} else if (val == sv.val) {
|
||||
if (orig < sv.orig) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
std::string mvt_tile::encode() {
|
||||
std::string data;
|
||||
|
||||
protozero::pbf_writer writer(data);
|
||||
|
||||
for (size_t i = 0; i < layers.size(); i++) {
|
||||
@@ -334,41 +341,58 @@ std::string mvt_tile::encode() {
|
||||
protozero::pbf_writer value_writer(value_string);
|
||||
mvt_value &pbv = layers[i].values[v];
|
||||
|
||||
if (pbv.type == mvt_string) {
|
||||
value_writer.add_string(1, pbv.string_value);
|
||||
} else if (pbv.type == mvt_float) {
|
||||
switch (pbv.type) {
|
||||
case mvt_string:
|
||||
value_writer.add_string(1, pbv.get_string_value());
|
||||
break;
|
||||
case mvt_float:
|
||||
value_writer.add_float(2, pbv.numeric_value.float_value);
|
||||
} else if (pbv.type == mvt_double) {
|
||||
break;
|
||||
case mvt_double:
|
||||
value_writer.add_double(3, pbv.numeric_value.double_value);
|
||||
} else if (pbv.type == mvt_int) {
|
||||
break;
|
||||
case mvt_int:
|
||||
value_writer.add_int64(4, pbv.numeric_value.int_value);
|
||||
} else if (pbv.type == mvt_uint) {
|
||||
break;
|
||||
case mvt_uint:
|
||||
value_writer.add_uint64(5, pbv.numeric_value.uint_value);
|
||||
} else if (pbv.type == mvt_sint) {
|
||||
break;
|
||||
case mvt_sint:
|
||||
value_writer.add_sint64(6, pbv.numeric_value.sint_value);
|
||||
} else if (pbv.type == mvt_bool) {
|
||||
break;
|
||||
case mvt_bool:
|
||||
value_writer.add_bool(7, pbv.numeric_value.bool_value);
|
||||
} else if (pbv.type == mvt_null) {
|
||||
break;
|
||||
case mvt_null:
|
||||
fprintf(stderr, "Internal error: trying to write null attribute to tile\n");
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
} else {
|
||||
default:
|
||||
fprintf(stderr, "Internal error: trying to write undefined attribute type to tile\n");
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
sorted_value sv;
|
||||
sv.val = value_string;
|
||||
sv.val = std::move(value_string);
|
||||
sv.orig = v;
|
||||
sorted_values.push_back(sv);
|
||||
sorted_values.push_back(std::move(sv));
|
||||
}
|
||||
|
||||
std::sort(sorted_values.begin(), sorted_values.end());
|
||||
std::stable_sort(sorted_values.begin(), sorted_values.end());
|
||||
std::vector<size_t> mapping;
|
||||
mapping.resize(sorted_values.size());
|
||||
|
||||
size_t value_index = 0;
|
||||
for (size_t v = 0; v < sorted_values.size(); v++) {
|
||||
mapping[sorted_values[v].orig] = v;
|
||||
mapping[sorted_values[v].orig] = value_index;
|
||||
layer_writer.add_message(4, sorted_values[v].val);
|
||||
|
||||
// crunch out duplicates that were missed by the hashing
|
||||
while (v + 1 < sorted_values.size() && sorted_values[v].val == sorted_values[v + 1].val) {
|
||||
mapping[sorted_values[v + 1].orig] = value_index;
|
||||
v++;
|
||||
}
|
||||
|
||||
value_index++;
|
||||
}
|
||||
|
||||
for (size_t f = 0; f < layers[i].features.size(); f++) {
|
||||
@@ -455,15 +479,70 @@ bool mvt_value::operator<(const mvt_value &o) const {
|
||||
return true;
|
||||
}
|
||||
if (type == o.type) {
|
||||
if ((type == mvt_string && string_value < o.string_value) ||
|
||||
(type == mvt_float && numeric_value.float_value < o.numeric_value.float_value) ||
|
||||
(type == mvt_double && numeric_value.double_value < o.numeric_value.double_value) ||
|
||||
(type == mvt_int && numeric_value.int_value < o.numeric_value.int_value) ||
|
||||
(type == mvt_uint && numeric_value.uint_value < o.numeric_value.uint_value) ||
|
||||
(type == mvt_sint && numeric_value.sint_value < o.numeric_value.sint_value) ||
|
||||
(type == mvt_bool && numeric_value.bool_value < o.numeric_value.bool_value) ||
|
||||
(type == mvt_null && numeric_value.null_value < o.numeric_value.null_value)) {
|
||||
return true;
|
||||
switch (type) {
|
||||
case mvt_string:
|
||||
return get_string_view() < o.get_string_view();
|
||||
|
||||
case mvt_float:
|
||||
return numeric_value.float_value < o.numeric_value.float_value;
|
||||
|
||||
case mvt_double:
|
||||
return numeric_value.double_value < o.numeric_value.double_value;
|
||||
|
||||
case mvt_int:
|
||||
return numeric_value.int_value < o.numeric_value.int_value;
|
||||
|
||||
case mvt_uint:
|
||||
return numeric_value.uint_value < o.numeric_value.uint_value;
|
||||
|
||||
case mvt_sint:
|
||||
return numeric_value.sint_value < o.numeric_value.sint_value;
|
||||
|
||||
case mvt_bool:
|
||||
return numeric_value.bool_value < o.numeric_value.bool_value;
|
||||
|
||||
case mvt_null:
|
||||
return numeric_value.null_value < o.numeric_value.null_value;
|
||||
|
||||
default:
|
||||
fprintf(stderr, "mvt_value::operator<<: can't happen\n");
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool mvt_value::operator==(const mvt_value &o) const {
|
||||
if (type == o.type) {
|
||||
switch (type) {
|
||||
case mvt_string:
|
||||
return get_string_view() == o.get_string_view();
|
||||
|
||||
case mvt_float:
|
||||
return numeric_value.float_value == o.numeric_value.float_value;
|
||||
|
||||
case mvt_double:
|
||||
return numeric_value.double_value == o.numeric_value.double_value;
|
||||
|
||||
case mvt_int:
|
||||
return numeric_value.int_value == o.numeric_value.int_value;
|
||||
|
||||
case mvt_uint:
|
||||
return numeric_value.uint_value == o.numeric_value.uint_value;
|
||||
|
||||
case mvt_sint:
|
||||
return numeric_value.sint_value == o.numeric_value.sint_value;
|
||||
|
||||
case mvt_bool:
|
||||
return numeric_value.bool_value == o.numeric_value.bool_value;
|
||||
|
||||
case mvt_null:
|
||||
return numeric_value.null_value == o.numeric_value.null_value;
|
||||
|
||||
default:
|
||||
fprintf(stderr, "mvt_value::operator==: can't happen\n");
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -492,61 +571,58 @@ static std::string quote(std::string const &s) {
|
||||
}
|
||||
|
||||
std::string mvt_value::toString() const {
|
||||
if (type == mvt_string) {
|
||||
return quote(string_value);
|
||||
} else if (type == mvt_int) {
|
||||
switch (type) {
|
||||
case mvt_string:
|
||||
return quote(get_string_value());
|
||||
case mvt_int:
|
||||
return std::to_string(numeric_value.int_value);
|
||||
} else if (type == mvt_double) {
|
||||
case mvt_double: {
|
||||
double v = numeric_value.double_value;
|
||||
if (v == (long long) v) {
|
||||
return std::to_string((long long) v);
|
||||
} else {
|
||||
return milo::dtoa_milo(v);
|
||||
}
|
||||
} else if (type == mvt_float) {
|
||||
}
|
||||
case mvt_float: {
|
||||
double v = numeric_value.float_value;
|
||||
if (v == (long long) v) {
|
||||
return std::to_string((long long) v);
|
||||
} else {
|
||||
return milo::dtoa_milo(v);
|
||||
}
|
||||
} else if (type == mvt_sint) {
|
||||
}
|
||||
case mvt_sint:
|
||||
return std::to_string(numeric_value.sint_value);
|
||||
} else if (type == mvt_uint) {
|
||||
case mvt_uint:
|
||||
return std::to_string(numeric_value.uint_value);
|
||||
} else if (type == mvt_bool) {
|
||||
case mvt_bool:
|
||||
return numeric_value.bool_value ? "true" : "false";
|
||||
} else if (type == mvt_null) {
|
||||
case mvt_null:
|
||||
return "null";
|
||||
} else {
|
||||
return "unknown";
|
||||
default:
|
||||
return "unknown " + std::to_string(type);
|
||||
}
|
||||
}
|
||||
|
||||
void mvt_layer::tag(mvt_feature &feature, std::string key, mvt_value value) {
|
||||
size_t ko, vo;
|
||||
|
||||
std::map<std::string, size_t>::iterator ki = key_map.find(key);
|
||||
std::map<mvt_value, size_t>::iterator vi = value_map.find(value);
|
||||
|
||||
if (ki == key_map.end()) {
|
||||
ko = keys.size();
|
||||
void mvt_layer::tag(mvt_feature &feature, std::string const &key, mvt_value const &value) {
|
||||
size_t key_hash = fnv1a(key) % key_dedup.size();
|
||||
if (key_dedup[key_hash] >= 0 &&
|
||||
keys[key_dedup[key_hash]] == key) {
|
||||
} else {
|
||||
key_dedup[key_hash] = keys.size();
|
||||
keys.push_back(key);
|
||||
key_map.insert(std::pair<std::string, size_t>(key, ko));
|
||||
} else {
|
||||
ko = ki->second;
|
||||
}
|
||||
feature.tags.push_back(key_dedup[key_hash]);
|
||||
|
||||
if (vi == value_map.end()) {
|
||||
vo = values.size();
|
||||
size_t value_hash = std::hash<mvt_value>()(value) % value_dedup.size();
|
||||
if (value_dedup[value_hash] >= 0 &&
|
||||
values[value_dedup[value_hash]] == value) {
|
||||
} else {
|
||||
value_dedup[value_hash] = values.size();
|
||||
values.push_back(value);
|
||||
value_map.insert(std::pair<mvt_value, size_t>(value, vo));
|
||||
} else {
|
||||
vo = vi->second;
|
||||
}
|
||||
|
||||
feature.tags.push_back(ko);
|
||||
feature.tags.push_back(vo);
|
||||
feature.tags.push_back(value_dedup[value_hash]);
|
||||
}
|
||||
|
||||
bool is_integer(const char *s, long long *v) {
|
||||
@@ -620,10 +696,17 @@ bool is_unsigned_integer(const char *s, unsigned long long *v) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
mvt_value stringified_to_mvt_value(int type, const char *s) {
|
||||
// This converts a serial_val-style attribute value to an mvt_value
|
||||
// to store in a tile. If the value is numeric, it tries to choose
|
||||
// the type (int, uint, sint, float, or double) that will give the
|
||||
// smallest representation in the tile without losing precision,
|
||||
// regardless of how the value was represented in the original source.
|
||||
mvt_value stringified_to_mvt_value(int type, const char *s, std::shared_ptr<std::string> const &tile_stringpool) {
|
||||
mvt_value tv;
|
||||
tv.s = tile_stringpool;
|
||||
|
||||
if (type == mvt_double) {
|
||||
switch (type) {
|
||||
case mvt_double: {
|
||||
long long v;
|
||||
unsigned long long uv;
|
||||
if (is_unsigned_integer(s, &uv)) {
|
||||
@@ -662,16 +745,93 @@ mvt_value stringified_to_mvt_value(int type, const char *s) {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (type == mvt_bool) {
|
||||
} break;
|
||||
case mvt_bool:
|
||||
tv.type = mvt_bool;
|
||||
tv.numeric_value.bool_value = (s[0] == 't');
|
||||
} else if (type == mvt_null) {
|
||||
break;
|
||||
case mvt_null:
|
||||
tv.type = mvt_null;
|
||||
tv.numeric_value.null_value = 0;
|
||||
} else {
|
||||
break;
|
||||
default:
|
||||
tv.type = mvt_string;
|
||||
tv.string_value = s;
|
||||
tv.set_string_value(s);
|
||||
}
|
||||
|
||||
return tv;
|
||||
}
|
||||
|
||||
// This converts a mvt_value attribute value from a tile back into
|
||||
// a serial_val for more convenient parsing and comparison without
|
||||
// having to handle all of the vector tile numeric types separately.
|
||||
// All numeric types are given the type mvt_double in the serial_val
|
||||
// whether the actual value is integer or floating point.
|
||||
serial_val mvt_value_to_serial_val(mvt_value const &v) {
|
||||
serial_val sv;
|
||||
|
||||
switch (v.type) {
|
||||
case mvt_string:
|
||||
sv.type = mvt_string;
|
||||
sv.s = v.get_string_value();
|
||||
break;
|
||||
case mvt_float:
|
||||
sv.type = mvt_double;
|
||||
sv.s = milo::dtoa_milo(v.numeric_value.float_value);
|
||||
break;
|
||||
case mvt_double:
|
||||
sv.type = mvt_double;
|
||||
sv.s = milo::dtoa_milo(v.numeric_value.double_value);
|
||||
break;
|
||||
case mvt_int:
|
||||
sv.type = mvt_double;
|
||||
sv.s = std::to_string(v.numeric_value.int_value);
|
||||
break;
|
||||
case mvt_uint:
|
||||
sv.type = mvt_double;
|
||||
sv.s = std::to_string(v.numeric_value.uint_value);
|
||||
break;
|
||||
case mvt_sint:
|
||||
sv.type = mvt_double;
|
||||
sv.s = std::to_string(v.numeric_value.sint_value);
|
||||
break;
|
||||
case mvt_bool:
|
||||
sv.type = mvt_bool;
|
||||
sv.s = v.numeric_value.bool_value ? "true" : "false";
|
||||
break;
|
||||
case mvt_null:
|
||||
sv.type = mvt_null;
|
||||
sv.s = "null";
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "unhandled mvt_type %d\n", v.type);
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
return sv;
|
||||
}
|
||||
|
||||
// This extracts an integer value from an mvt_value
|
||||
long long mvt_value_to_long_long(mvt_value const &v) {
|
||||
switch (v.type) {
|
||||
case mvt_string:
|
||||
return atoll(v.c_str());
|
||||
case mvt_float:
|
||||
return v.numeric_value.float_value;
|
||||
case mvt_double:
|
||||
return v.numeric_value.double_value;
|
||||
case mvt_int:
|
||||
return v.numeric_value.int_value;
|
||||
case mvt_uint:
|
||||
return v.numeric_value.uint_value;
|
||||
case mvt_sint:
|
||||
return v.numeric_value.sint_value;
|
||||
case mvt_bool:
|
||||
return v.numeric_value.bool_value;
|
||||
case mvt_null:
|
||||
return 0;
|
||||
default:
|
||||
fprintf(stderr, "unhandled mvt_type %d\n", v.type);
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,9 +3,15 @@
|
||||
|
||||
#include <sqlite3.h>
|
||||
#include <string>
|
||||
#include <map>
|
||||
#include <string_view>
|
||||
#include <unordered_map>
|
||||
#include <set>
|
||||
#include <vector>
|
||||
#include <optional>
|
||||
#include <memory>
|
||||
|
||||
#include "errors.hpp"
|
||||
#include "text.hpp"
|
||||
|
||||
struct mvt_value;
|
||||
struct mvt_layer;
|
||||
@@ -48,7 +54,8 @@ struct mvt_feature {
|
||||
int /* mvt_geometry_type */ type = 0;
|
||||
unsigned long long id = 0;
|
||||
bool has_id = false;
|
||||
bool dropped = false;
|
||||
int dropped = 0;
|
||||
size_t seq = 0; // used for ordering in overzoom
|
||||
|
||||
mvt_feature() {
|
||||
has_id = false;
|
||||
@@ -65,11 +72,14 @@ enum mvt_value_type {
|
||||
mvt_sint,
|
||||
mvt_bool,
|
||||
mvt_null,
|
||||
|
||||
mvt_no_such_key,
|
||||
};
|
||||
|
||||
struct mvt_value {
|
||||
mvt_value_type type;
|
||||
std::string string_value;
|
||||
std::shared_ptr<std::string> s;
|
||||
|
||||
union {
|
||||
float float_value;
|
||||
double double_value;
|
||||
@@ -78,18 +88,81 @@ struct mvt_value {
|
||||
long long sint_value;
|
||||
bool bool_value;
|
||||
int null_value;
|
||||
struct {
|
||||
size_t off;
|
||||
size_t len;
|
||||
} string_value;
|
||||
} numeric_value;
|
||||
|
||||
std::string get_string_value() const {
|
||||
return std::string(*s, numeric_value.string_value.off, numeric_value.string_value.len);
|
||||
}
|
||||
|
||||
std::string_view get_string_view() const {
|
||||
return std::string_view(s->c_str() + numeric_value.string_value.off, numeric_value.string_value.len);
|
||||
}
|
||||
|
||||
const char *c_str() const {
|
||||
return s->c_str() + numeric_value.string_value.off;
|
||||
}
|
||||
|
||||
void set_string_value(const std::string_view &val) {
|
||||
if (s == nullptr) {
|
||||
s = std::make_shared<std::string>();
|
||||
}
|
||||
|
||||
type = mvt_string;
|
||||
numeric_value.string_value.off = s->size();
|
||||
numeric_value.string_value.len = val.size();
|
||||
s->append(val);
|
||||
s->push_back('\0');
|
||||
}
|
||||
|
||||
bool operator<(const mvt_value &o) const;
|
||||
bool operator==(const mvt_value &o) const;
|
||||
std::string toString() const;
|
||||
|
||||
mvt_value() {
|
||||
this->type = mvt_double;
|
||||
this->string_value = "";
|
||||
this->numeric_value.double_value = 0;
|
||||
}
|
||||
};
|
||||
|
||||
template <>
|
||||
struct std::hash<mvt_value> {
|
||||
std::size_t operator()(const mvt_value &k) const {
|
||||
switch (k.type) {
|
||||
case mvt_string:
|
||||
return fnv1a(k.c_str(), 0);
|
||||
|
||||
case mvt_float:
|
||||
return fnv1a(sizeof(float), (void *) &k.numeric_value.float_value);
|
||||
|
||||
case mvt_double:
|
||||
return fnv1a(sizeof(double), (void *) &k.numeric_value.double_value);
|
||||
|
||||
case mvt_int:
|
||||
return fnv1a(sizeof(long long), (void *) &k.numeric_value.int_value);
|
||||
|
||||
case mvt_uint:
|
||||
return fnv1a(sizeof(unsigned long long), (void *) &k.numeric_value.uint_value);
|
||||
|
||||
case mvt_sint:
|
||||
return fnv1a(sizeof(long long), (void *) &k.numeric_value.sint_value);
|
||||
|
||||
case mvt_bool:
|
||||
return fnv1a(sizeof(bool), (void *) &k.numeric_value.bool_value);
|
||||
|
||||
case mvt_null:
|
||||
return fnv1a(sizeof(int), (void *) &k.numeric_value.null_value);
|
||||
|
||||
default:
|
||||
fprintf(stderr, "mvt_value hash can't happen\n");
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
struct mvt_layer {
|
||||
int version = 0;
|
||||
std::string name = "";
|
||||
@@ -99,18 +172,18 @@ struct mvt_layer {
|
||||
long long extent = 0;
|
||||
|
||||
// Add a key-value pair to a feature, using this layer's constant pool
|
||||
void tag(mvt_feature &feature, std::string key, mvt_value value);
|
||||
void tag(mvt_feature &feature, std::string const &key, mvt_value const &value);
|
||||
|
||||
// For tracking the key-value constants already used in this layer
|
||||
std::map<std::string, size_t> key_map{};
|
||||
std::map<mvt_value, size_t> value_map{};
|
||||
std::vector<ssize_t> key_dedup = std::vector<ssize_t>(65536, -1);
|
||||
std::vector<ssize_t> value_dedup = std::vector<ssize_t>(65536, -1);
|
||||
};
|
||||
|
||||
struct mvt_tile {
|
||||
std::vector<mvt_layer> layers{};
|
||||
|
||||
std::string encode();
|
||||
bool decode(std::string &message, bool &was_compressed);
|
||||
bool decode(const std::string &message, bool &was_compressed);
|
||||
};
|
||||
|
||||
bool is_compressed(std::string const &data);
|
||||
@@ -118,8 +191,12 @@ int decompress(std::string const &input, std::string &output);
|
||||
int compress(std::string const &input, std::string &output, bool gz);
|
||||
int dezig(unsigned n);
|
||||
|
||||
mvt_value stringified_to_mvt_value(int type, const char *s);
|
||||
mvt_value stringified_to_mvt_value(int type, const char *s, std::shared_ptr<std::string> const &tile_stringpool);
|
||||
long long mvt_value_to_long_long(mvt_value const &v);
|
||||
|
||||
bool is_integer(const char *s, long long *v);
|
||||
bool is_unsigned_integer(const char *s, unsigned long long *v);
|
||||
|
||||
struct serial_val;
|
||||
serial_val mvt_value_to_serial_val(mvt_value const &v);
|
||||
#endif
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
#define P_CLIPPING ((int) 'c')
|
||||
#define P_DUPLICATION ((int) 'D')
|
||||
#define P_TINY_POLYGON_REDUCTION ((int) 't')
|
||||
#define P_TINY_POLYGON_REDUCTION_AT_MAXZOOM ((int) 'T')
|
||||
#define P_TILE_COMPRESSION ((int) 'C')
|
||||
#define P_TILE_STATS ((int) 'g')
|
||||
#define P_USE_SOURCE_POLYGON_WINDING ((int) 'w')
|
||||
|
||||
+63
-121
@@ -6,133 +6,23 @@
|
||||
#include "errors.hpp"
|
||||
#include "mvt.hpp"
|
||||
#include "geometry.hpp"
|
||||
#include "evaluator.hpp"
|
||||
#include "attribute.hpp"
|
||||
#include "text.hpp"
|
||||
|
||||
extern char *optarg;
|
||||
extern int optind;
|
||||
|
||||
int detail = 12; // tippecanoe-style: mvt extent == 1 << detail
|
||||
int buffer = 5; // tippecanoe-style: mvt buffer == extent * buffer / 256;
|
||||
int buffer = 5; // tippecanoe-style: mvt buffer == extent * buffer / 256;
|
||||
bool demultiply = false;
|
||||
std::string filter;
|
||||
bool preserve_input_order = false;
|
||||
std::unordered_map<std::string, attribute_op> attribute_accum;
|
||||
std::vector<std::string> unidecode_data;
|
||||
|
||||
std::set<std::string> keep;
|
||||
|
||||
std::string overzoom(std::string s, int oz, int ox, int oy, int nz, int nx, int ny) {
|
||||
mvt_tile tile, outtile;
|
||||
bool was_compressed;
|
||||
|
||||
try {
|
||||
if (!tile.decode(s, was_compressed)) {
|
||||
fprintf(stderr, "Couldn't parse tile %d/%u/%u\n", oz, ox, oy);
|
||||
exit(EXIT_MVT);
|
||||
}
|
||||
} catch (std::exception const &e) {
|
||||
fprintf(stderr, "PBF decoding error in tile %d/%u/%u\n", oz, ox, oy);
|
||||
exit(EXIT_PROTOBUF);
|
||||
}
|
||||
|
||||
for (auto const &layer : tile.layers) {
|
||||
mvt_layer outlayer = mvt_layer();
|
||||
|
||||
outlayer.name = layer.name;
|
||||
outlayer.version = layer.version;
|
||||
outlayer.extent = 1LL << detail;
|
||||
|
||||
for (auto const &feature : layer.features) {
|
||||
mvt_feature outfeature;
|
||||
drawvec geom;
|
||||
int t = feature.type;
|
||||
|
||||
// Convert feature geometry to world coordinates
|
||||
|
||||
long long tilesize = 1LL << (32 - oz); // source tile size in world coordinates
|
||||
draw ring_closure(0, 0, 0);
|
||||
|
||||
for (auto const &g : feature.geometry) {
|
||||
if (g.op == mvt_closepath) {
|
||||
geom.push_back(ring_closure);
|
||||
} else {
|
||||
geom.emplace_back(g.op,
|
||||
g.x * tilesize / layer.extent + ox * tilesize,
|
||||
g.y * tilesize / layer.extent + oy * tilesize);
|
||||
|
||||
if (g.op == mvt_moveto) {
|
||||
ring_closure = geom.back();
|
||||
ring_closure.op = mvt_lineto;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Now offset from world coordinates to output tile coordinates,
|
||||
// but retain world scale, because that is what tippecanoe clipping expects
|
||||
|
||||
long long outtilesize = 1LL << (32 - nz); // destination tile size in world coordinates
|
||||
for (auto &g : geom) {
|
||||
g.x -= nx * outtilesize;
|
||||
g.y -= ny * outtilesize;
|
||||
}
|
||||
|
||||
// Clip to output tile
|
||||
|
||||
if (t == VT_LINE) {
|
||||
geom = clip_lines(geom, nz, buffer);
|
||||
} else if (t == VT_POLYGON) {
|
||||
geom = simple_clip_poly(geom, nz, buffer);
|
||||
} else if (t == VT_POINT) {
|
||||
geom = clip_point(geom, nz, buffer);
|
||||
}
|
||||
|
||||
// Scale to output tile extent
|
||||
|
||||
to_tile_scale(geom, nz, detail);
|
||||
|
||||
// Clean geometries
|
||||
|
||||
geom = remove_noop(geom, t, 0);
|
||||
if (t == VT_POLYGON) {
|
||||
geom = clean_or_clip_poly(geom, 0, 0, false);
|
||||
geom = close_poly(geom);
|
||||
}
|
||||
|
||||
// Add geometry to output feature
|
||||
|
||||
outfeature.type = t;
|
||||
for (auto const &g : geom) {
|
||||
outfeature.geometry.emplace_back(g.op, g.x, g.y);
|
||||
}
|
||||
|
||||
// ID and attributes, if it didn't get clipped away
|
||||
|
||||
if (outfeature.geometry.size() > 0) {
|
||||
if (feature.has_id) {
|
||||
outfeature.has_id = true;
|
||||
outfeature.id = feature.id;
|
||||
}
|
||||
|
||||
for (size_t i = 0; i + 1 < feature.tags.size(); i += 2) {
|
||||
if (keep.size() == 0 || keep.find(layer.keys[feature.tags[i]]) != keep.end()) {
|
||||
outlayer.tag(outfeature, layer.keys[feature.tags[i]], layer.values[feature.tags[i + 1]]);
|
||||
}
|
||||
}
|
||||
|
||||
outlayer.features.push_back(outfeature);
|
||||
}
|
||||
}
|
||||
|
||||
if (outlayer.features.size() > 0) {
|
||||
outtile.layers.push_back(outlayer);
|
||||
}
|
||||
}
|
||||
|
||||
if (outtile.layers.size() > 0) {
|
||||
std::string pbf = outtile.encode();
|
||||
std::string compressed;
|
||||
compress(pbf, compressed, true);
|
||||
|
||||
return compressed;
|
||||
} else {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
void usage(char **argv) {
|
||||
fprintf(stderr, "Usage: %s -o newtile.pbf.gz tile.pbf.gz oz/ox/oy nz/nx/ny\n", argv[0]);
|
||||
fprintf(stderr, "to create tile nz/nx/ny from tile oz/ox/oy\n");
|
||||
@@ -143,7 +33,33 @@ int main(int argc, char **argv) {
|
||||
int i;
|
||||
const char *outfile = NULL;
|
||||
|
||||
while ((i = getopt(argc, argv, "y:o:d:b:")) != -1) {
|
||||
struct option long_options[] = {
|
||||
{"include", required_argument, 0, 'y'},
|
||||
{"full-detail", required_argument, 0, 'd'},
|
||||
{"buffer", required_argument, 0, 'b'},
|
||||
{"output", required_argument, 0, 'o'},
|
||||
{"filter-points-multiplier", no_argument, 0, 'm'},
|
||||
{"feature-filter", required_argument, 0, 'j'},
|
||||
{"preserve-input-order", no_argument, 0, 'o' & 0x1F},
|
||||
{"accumulate-attribute", required_argument, 0, 'E'},
|
||||
{"unidecode-data", required_argument, 0, 'u' & 0x1F},
|
||||
|
||||
{0, 0, 0, 0},
|
||||
};
|
||||
|
||||
std::string getopt_str;
|
||||
for (size_t lo = 0; long_options[lo].name != NULL; lo++) {
|
||||
if (long_options[lo].val > ' ') {
|
||||
getopt_str.push_back(long_options[lo].val);
|
||||
|
||||
if (long_options[lo].has_arg == required_argument) {
|
||||
getopt_str.push_back(':');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int option_index = 0;
|
||||
while ((i = getopt_long(argc, argv, getopt_str.c_str(), long_options, &option_index)) != -1) {
|
||||
switch (i) {
|
||||
case 'y':
|
||||
keep.insert(optarg);
|
||||
@@ -161,7 +77,28 @@ int main(int argc, char **argv) {
|
||||
buffer = atoi(optarg);
|
||||
break;
|
||||
|
||||
case 'm':
|
||||
demultiply = true;
|
||||
break;
|
||||
|
||||
case 'j':
|
||||
filter = optarg;
|
||||
break;
|
||||
|
||||
case 'o' & 0x1F:
|
||||
preserve_input_order = true;
|
||||
break;
|
||||
|
||||
case 'E':
|
||||
set_attribute_accum(attribute_accum, optarg, argv);
|
||||
break;
|
||||
|
||||
case 'u' & 0x1F:
|
||||
unidecode_data = read_unidecode(optarg);
|
||||
break;
|
||||
|
||||
default:
|
||||
fprintf(stderr, "Unrecognized flag -%c\n", i);
|
||||
usage(argv);
|
||||
}
|
||||
}
|
||||
@@ -209,7 +146,12 @@ int main(int argc, char **argv) {
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
std::string out = overzoom(tile, oz, ox, oy, nz, nx, ny);
|
||||
json_object *json_filter = NULL;
|
||||
if (filter.size() > 0) {
|
||||
json_filter = parse_filter(filter.c_str());
|
||||
}
|
||||
|
||||
std::string out = overzoom(tile, oz, ox, oy, nz, nx, ny, detail, buffer, keep, true, NULL, demultiply, json_filter, preserve_input_order, attribute_accum, unidecode_data);
|
||||
fwrite(out.c_str(), sizeof(char), out.size(), f);
|
||||
fclose(f);
|
||||
|
||||
|
||||
+34
-42
@@ -25,6 +25,7 @@
|
||||
#include "geometry.hpp"
|
||||
#include "serial.hpp"
|
||||
#include "errors.hpp"
|
||||
#include "thread.hpp"
|
||||
|
||||
extern "C" {
|
||||
#include "jsonpull/jsonpull.h"
|
||||
@@ -87,6 +88,7 @@ static std::vector<mvt_geometry> to_feature(drawvec &geom) {
|
||||
// Reads from the postfilter
|
||||
std::vector<mvt_layer> parse_layers(int fd, int z, unsigned x, unsigned y, std::vector<std::map<std::string, layermap_entry>> *layermaps, size_t tiling_seg, std::vector<std::vector<std::string>> *layer_unmaps, int extent) {
|
||||
std::map<std::string, mvt_layer> ret;
|
||||
std::shared_ptr<std::string> tile_stringpool = std::make_shared<std::string>();
|
||||
|
||||
FILE *f = fdopen(fd, "r");
|
||||
if (f == NULL) {
|
||||
@@ -202,7 +204,8 @@ std::vector<mvt_layer> parse_layers(int fd, int z, unsigned x, unsigned y, std::
|
||||
}
|
||||
|
||||
if (mb_geometry[t] == VT_POLYGON) {
|
||||
dv = clean_or_clip_poly(dv, 0, 0, false);
|
||||
// we can try scaling up because these are tile coordinates
|
||||
dv = clean_or_clip_poly(dv, 0, 0, false, true);
|
||||
if (dv.size() < 3) {
|
||||
dv.clear();
|
||||
}
|
||||
@@ -240,44 +243,37 @@ std::vector<mvt_layer> parse_layers(int fd, int z, unsigned x, unsigned y, std::
|
||||
}
|
||||
}
|
||||
|
||||
auto fk = layermap.find(layername);
|
||||
if (fk == layermap.end()) {
|
||||
auto ts = layermap.find(layername);
|
||||
if (ts == layermap.end()) {
|
||||
fprintf(stderr, "Internal error: layer %s not found\n", layername.c_str());
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
if (z < fk->second.minzoom) {
|
||||
fk->second.minzoom = z;
|
||||
if (z < ts->second.minzoom) {
|
||||
ts->second.minzoom = z;
|
||||
}
|
||||
if (z > fk->second.maxzoom) {
|
||||
fk->second.maxzoom = z;
|
||||
if (z > ts->second.maxzoom) {
|
||||
ts->second.maxzoom = z;
|
||||
}
|
||||
|
||||
if (feature.type == mvt_point) {
|
||||
fk->second.points++;
|
||||
ts->second.points++;
|
||||
} else if (feature.type == mvt_linestring) {
|
||||
fk->second.lines++;
|
||||
ts->second.lines++;
|
||||
} else if (feature.type == mvt_polygon) {
|
||||
fk->second.polygons++;
|
||||
ts->second.polygons++;
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < properties->value.object.length; i++) {
|
||||
int tp = -1;
|
||||
std::string s;
|
||||
|
||||
stringify_value(properties->value.object.values[i], tp, s, "Filter output", jp->line, j);
|
||||
serial_val sv = stringify_value(properties->value.object.values[i], "Filter output", jp->line, j);
|
||||
|
||||
// Nulls can be excluded here because this is the postfilter
|
||||
// and it is nearly time to create the vector representation
|
||||
|
||||
if (tp >= 0 && tp != mvt_null) {
|
||||
mvt_value v = stringified_to_mvt_value(tp, s.c_str());
|
||||
if (sv.type != mvt_null) {
|
||||
mvt_value v = stringified_to_mvt_value(sv.type, sv.s.c_str(), tile_stringpool);
|
||||
l->second.tag(feature, std::string(properties->value.object.keys[i]->value.string.string), v);
|
||||
|
||||
type_and_string attrib;
|
||||
attrib.type = tp;
|
||||
attrib.string = s;
|
||||
|
||||
add_to_file_keys(fk->second.file_keys, std::string(properties->value.object.keys[i]->value.string.string), attrib);
|
||||
add_to_tilestats(ts->second.tilestats, std::string(properties->value.object.keys[i]->value.string.string), sv);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -432,7 +428,9 @@ serial_feature parse_feature(json_pull *jp, int z, unsigned x, unsigned y, std::
|
||||
|
||||
json_object *dropped = json_hash_get(tippecanoe, "dropped");
|
||||
if (dropped != NULL && dropped->type == JSON_TRUE) {
|
||||
sf.dropped = true;
|
||||
sf.dropped = FEATURE_DROPPED; // dropped
|
||||
} else {
|
||||
sf.dropped = FEATURE_KEPT; // kept
|
||||
}
|
||||
}
|
||||
|
||||
@@ -477,49 +475,42 @@ serial_feature parse_feature(json_pull *jp, int z, unsigned x, unsigned y, std::
|
||||
}
|
||||
}
|
||||
|
||||
auto fk = layermap.find(layername);
|
||||
if (fk == layermap.end()) {
|
||||
auto ts = layermap.find(layername);
|
||||
if (ts == layermap.end()) {
|
||||
fprintf(stderr, "Internal error: layer %s not found\n", layername.c_str());
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
sf.layer = fk->second.id;
|
||||
sf.layer = ts->second.id;
|
||||
|
||||
if (z < fk->second.minzoom) {
|
||||
fk->second.minzoom = z;
|
||||
if (z < ts->second.minzoom) {
|
||||
ts->second.minzoom = z;
|
||||
}
|
||||
if (z > fk->second.maxzoom) {
|
||||
fk->second.maxzoom = z;
|
||||
if (z > ts->second.maxzoom) {
|
||||
ts->second.maxzoom = z;
|
||||
}
|
||||
|
||||
if (!postfilter) {
|
||||
if (sf.t == mvt_point) {
|
||||
fk->second.points++;
|
||||
ts->second.points++;
|
||||
} else if (sf.t == mvt_linestring) {
|
||||
fk->second.lines++;
|
||||
ts->second.lines++;
|
||||
} else if (sf.t == mvt_polygon) {
|
||||
fk->second.polygons++;
|
||||
ts->second.polygons++;
|
||||
}
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < properties->value.object.length; i++) {
|
||||
serial_val v;
|
||||
v.type = -1;
|
||||
|
||||
stringify_value(properties->value.object.values[i], v.type, v.s, "Filter output", jp->line, j);
|
||||
serial_val v = stringify_value(properties->value.object.values[i], "Filter output", jp->line, j);
|
||||
|
||||
// Nulls can be excluded here because the expression evaluation filter
|
||||
// would have already run before prefiltering
|
||||
|
||||
if (v.type >= 0 && v.type != mvt_null) {
|
||||
if (v.type != mvt_null) {
|
||||
sf.full_keys.push_back(std::string(properties->value.object.keys[i]->value.string.string));
|
||||
sf.full_values.push_back(v);
|
||||
|
||||
type_and_string attrib;
|
||||
attrib.string = v.s;
|
||||
attrib.type = v.type;
|
||||
|
||||
if (!postfilter) {
|
||||
add_to_file_keys(fk->second.file_keys, std::string(properties->value.object.keys[i]->value.string.string), attrib);
|
||||
add_to_tilestats(ts->second.tilestats, std::string(properties->value.object.keys[i]->value.string.string), v);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -642,6 +633,7 @@ std::vector<mvt_layer> filter_layers(const char *filter, std::vector<mvt_layer>
|
||||
wa.extent = extent;
|
||||
|
||||
pthread_t writer;
|
||||
// this does need to be a real thread, so we can pipe both to and from it
|
||||
if (pthread_create(&writer, NULL, run_writer, &wa) != 0) {
|
||||
perror("pthread_create (filter writer)");
|
||||
exit(EXIT_PTHREAD);
|
||||
|
||||
+3
-3
@@ -166,11 +166,11 @@ struct entryv3 {
|
||||
}
|
||||
};
|
||||
|
||||
struct {
|
||||
struct entryv3_cmp {
|
||||
bool operator()(entryv3 a, entryv3 b) const {
|
||||
return a.tile_id < b.tile_id;
|
||||
}
|
||||
} entryv3_cmp;
|
||||
};
|
||||
|
||||
struct entry_zxy {
|
||||
uint8_t z;
|
||||
@@ -388,7 +388,7 @@ inline uint64_t zxy_to_tileid(uint8_t z, uint32_t x, uint32_t y) {
|
||||
if (z > 31) {
|
||||
throw std::overflow_error("tile zoom exceeds 64-bit limit");
|
||||
}
|
||||
if (x > (1 << z) - 1 || y > (1 << z) - 1) {
|
||||
if (x > (1U << z) - 1 || y > (1U << z) - 1) {
|
||||
throw std::overflow_error("tile x/y outside zoom level bounds");
|
||||
}
|
||||
uint64_t acc = 0;
|
||||
|
||||
+15
-2
@@ -103,6 +103,13 @@ std::string metadata_to_pmtiles_json(metadata m) {
|
||||
state.json_write_string("strategies");
|
||||
state.json_write_json(m.strategies_json);
|
||||
}
|
||||
|
||||
if (m.decisions_json.size() > 0) {
|
||||
state.json_comma_newline();
|
||||
state.json_write_string("tippecanoe_decisions");
|
||||
state.json_write_json(m.decisions_json);
|
||||
}
|
||||
|
||||
out(state, "generator", m.generator);
|
||||
out(state, "generator_options", m.generator_options);
|
||||
|
||||
@@ -167,7 +174,7 @@ void mbtiles_map_image_to_pmtiles(char *fname, metadata m, bool tile_compression
|
||||
sqlite3_finalize(stmt);
|
||||
}
|
||||
|
||||
std::sort(tile_ids.begin(), tile_ids.end());
|
||||
std::stable_sort(tile_ids.begin(), tile_ids.end());
|
||||
|
||||
std::unordered_map<std::string, std::pair<unsigned long long, unsigned long>> hash_to_offset_len;
|
||||
std::vector<pmtiles::entryv3> entries;
|
||||
@@ -256,7 +263,7 @@ void mbtiles_map_image_to_pmtiles(char *fname, metadata m, bool tile_compression
|
||||
|
||||
// finalize PMTiles archive.
|
||||
{
|
||||
std::sort(entries.begin(), entries.end(), pmtiles::entryv3_cmp);
|
||||
std::stable_sort(entries.begin(), entries.end(), pmtiles::entryv3_cmp());
|
||||
|
||||
std::string root_bytes;
|
||||
std::string leaves_bytes;
|
||||
@@ -428,6 +435,12 @@ sqlite3 *pmtilesmeta2tmp(const char *fname, const char *pmtiles_map) {
|
||||
fprintf(stderr, "set %s in metadata: %s\n", key, err);
|
||||
}
|
||||
sqlite3_free(sql);
|
||||
} else if (strcmp(key, "tippecanoe_decisions") == 0 && o->value.object.values[i]->type == JSON_HASH) {
|
||||
sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES ('tippecanoe_decisions', %Q);", json_stringify(o->value.object.values[i]));
|
||||
if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) {
|
||||
fprintf(stderr, "set %s in metadata: %s\n", key, err);
|
||||
}
|
||||
sqlite3_free(sql);
|
||||
} else if (o->value.object.keys[i]->type != JSON_STRING || o->value.object.values[i]->type != JSON_STRING) {
|
||||
fprintf(stderr, "%s\n", key);
|
||||
fprintf(stderr, "%s: non-string in metadata\n", fname);
|
||||
|
||||
@@ -7,32 +7,33 @@
|
||||
#include "memfile.hpp"
|
||||
#include "pool.hpp"
|
||||
#include "errors.hpp"
|
||||
#include "text.hpp"
|
||||
|
||||
int swizzlecmp(const char *a, const char *b) {
|
||||
ssize_t alen = strlen(a);
|
||||
ssize_t blen = strlen(b);
|
||||
|
||||
if (strcmp(a, b) == 0) {
|
||||
return 0;
|
||||
inline int swizzlecmp(const char *a, int atype, unsigned long long ahash, const char *b, int btype, unsigned long long bhash) {
|
||||
if (ahash == bhash) {
|
||||
if (atype == btype) {
|
||||
return strcmp(a, b);
|
||||
} else {
|
||||
return atype - btype;
|
||||
}
|
||||
} else {
|
||||
return (int) (ahash - bhash);
|
||||
}
|
||||
|
||||
long long hash1 = 0, hash2 = 0;
|
||||
for (ssize_t i = alen - 1; i >= 0; i--) {
|
||||
hash1 = (hash1 * 37 + a[i]) & INT_MAX;
|
||||
}
|
||||
for (ssize_t i = blen - 1; i >= 0; i--) {
|
||||
hash2 = (hash2 * 37 + b[i]) & INT_MAX;
|
||||
}
|
||||
|
||||
int h1 = hash1, h2 = hash2;
|
||||
if (h1 == h2) {
|
||||
return strcmp(a, b);
|
||||
}
|
||||
|
||||
return h1 - h2;
|
||||
}
|
||||
|
||||
long long addpool(struct memfile *poolfile, struct memfile *treefile, const char *s, char type) {
|
||||
long long addpool(struct memfile *poolfile, struct memfile *treefile, const char *s, char type, std::vector<ssize_t> &dedup) {
|
||||
unsigned long long hash = fnv1a(s, type);
|
||||
size_t hash_off = hash % dedup.size();
|
||||
|
||||
if (dedup[hash_off] >= 0 &&
|
||||
poolfile->map[dedup[hash_off]] == type &&
|
||||
strcmp(poolfile->map.c_str() + dedup[hash_off] + 1, s) == 0) {
|
||||
// printf("hit for %s\n", s);
|
||||
return dedup[hash_off];
|
||||
} else {
|
||||
// printf("miss for %s\n", s);
|
||||
}
|
||||
|
||||
unsigned long *sp = &treefile->tree;
|
||||
size_t depth = 0;
|
||||
|
||||
@@ -43,17 +44,17 @@ long long addpool(struct memfile *poolfile, struct memfile *treefile, const char
|
||||
}
|
||||
|
||||
while (*sp != 0) {
|
||||
int cmp = swizzlecmp(s, poolfile->map.c_str() + ((struct stringpool *) (treefile->map.c_str() + *sp))->off + 1);
|
||||
|
||||
if (cmp == 0) {
|
||||
cmp = type - (poolfile->map.c_str() + ((struct stringpool *) (treefile->map.c_str() + *sp))->off)[0];
|
||||
}
|
||||
int cmp = swizzlecmp(s, type, hash,
|
||||
poolfile->map.c_str() + ((struct stringpool *) (treefile->map.c_str() + *sp))->off + 1,
|
||||
(poolfile->map.c_str() + ((struct stringpool *) (treefile->map.c_str() + *sp))->off)[0],
|
||||
((struct stringpool *) (treefile->map.c_str() + *sp))->hash);
|
||||
|
||||
if (cmp < 0) {
|
||||
sp = &(((struct stringpool *) (treefile->map.c_str() + *sp))->left);
|
||||
} else if (cmp > 0) {
|
||||
sp = &(((struct stringpool *) (treefile->map.c_str() + *sp))->right);
|
||||
} else {
|
||||
dedup[hash_off] = ((struct stringpool *) (treefile->map.c_str() + *sp))->off;
|
||||
return ((struct stringpool *) (treefile->map.c_str() + *sp))->off;
|
||||
}
|
||||
|
||||
@@ -65,14 +66,20 @@ long long addpool(struct memfile *poolfile, struct memfile *treefile, const char
|
||||
// the pool is full yet.
|
||||
|
||||
long long off = poolfile->off;
|
||||
if (memfile_write(poolfile, &type, 1) < 0) {
|
||||
bool in_memory = false;
|
||||
|
||||
if (memfile_write(poolfile, &type, 1, in_memory) < 0) {
|
||||
perror("memfile write");
|
||||
exit(EXIT_WRITE);
|
||||
}
|
||||
if (memfile_write(poolfile, (void *) s, strlen(s) + 1) < 0) {
|
||||
if (memfile_write(poolfile, (void *) s, strlen(s) + 1, in_memory) < 0) {
|
||||
perror("memfile write");
|
||||
exit(EXIT_WRITE);
|
||||
}
|
||||
|
||||
if (in_memory) {
|
||||
dedup[hash_off] = off;
|
||||
}
|
||||
return off;
|
||||
}
|
||||
}
|
||||
@@ -95,11 +102,12 @@ long long addpool(struct memfile *poolfile, struct memfile *treefile, const char
|
||||
// to the newly-added strings.
|
||||
|
||||
long long off = poolfile->off;
|
||||
if (memfile_write(poolfile, &type, 1) < 0) {
|
||||
bool in_memory;
|
||||
if (memfile_write(poolfile, &type, 1, in_memory) < 0) {
|
||||
perror("memfile write");
|
||||
exit(EXIT_WRITE);
|
||||
}
|
||||
if (memfile_write(poolfile, (void *) s, strlen(s) + 1) < 0) {
|
||||
if (memfile_write(poolfile, (void *) s, strlen(s) + 1, in_memory) < 0) {
|
||||
perror("memfile write");
|
||||
exit(EXIT_WRITE);
|
||||
}
|
||||
@@ -115,14 +123,18 @@ long long addpool(struct memfile *poolfile, struct memfile *treefile, const char
|
||||
}
|
||||
|
||||
long long off = poolfile->off;
|
||||
if (memfile_write(poolfile, &type, 1) < 0) {
|
||||
bool in_memory = false;
|
||||
if (memfile_write(poolfile, &type, 1, in_memory) < 0) {
|
||||
perror("memfile write");
|
||||
exit(EXIT_WRITE);
|
||||
}
|
||||
if (memfile_write(poolfile, (void *) s, strlen(s) + 1) < 0) {
|
||||
if (memfile_write(poolfile, (void *) s, strlen(s) + 1, in_memory) < 0) {
|
||||
perror("memfile write");
|
||||
exit(EXIT_WRITE);
|
||||
}
|
||||
if (in_memory) {
|
||||
dedup[hash_off] = off;
|
||||
}
|
||||
|
||||
if (off >= LONG_MAX || treefile->off >= LONG_MAX) {
|
||||
// Tree or pool is bigger than 2GB
|
||||
@@ -138,9 +150,10 @@ long long addpool(struct memfile *poolfile, struct memfile *treefile, const char
|
||||
tsp.left = 0;
|
||||
tsp.right = 0;
|
||||
tsp.off = off;
|
||||
tsp.hash = hash;
|
||||
|
||||
long long p = treefile->off;
|
||||
if (memfile_write(treefile, &tsp, sizeof(struct stringpool)) < 0) {
|
||||
if (memfile_write(treefile, &tsp, sizeof(struct stringpool), in_memory) < 0) {
|
||||
perror("memfile write");
|
||||
exit(EXIT_WRITE);
|
||||
}
|
||||
|
||||
@@ -4,9 +4,11 @@
|
||||
struct stringpool {
|
||||
unsigned long left = 0;
|
||||
unsigned long right = 0;
|
||||
|
||||
unsigned long off = 0;
|
||||
size_t hash; // hash of the string at this node
|
||||
};
|
||||
|
||||
long long addpool(struct memfile *poolfile, struct memfile *treefile, const char *s, char type);
|
||||
long long addpool(struct memfile *poolfile, struct memfile *treefile, const char *s, char type, std::vector<ssize_t> &dedup);
|
||||
|
||||
#endif
|
||||
|
||||
+4
-4
@@ -57,8 +57,8 @@ void lonlat2tile(double lon, double lat, int zoom, long long *x, long long *y) {
|
||||
double lat_rad = lat * M_PI / 180;
|
||||
unsigned long long n = 1LL << zoom;
|
||||
|
||||
long long llx = n * ((lon + 180) / 360);
|
||||
long long lly = n * (1 - (log(tan(lat_rad) + 1 / cos(lat_rad)) / M_PI)) / 2;
|
||||
long long llx = std::round(n * ((lon + 180) / 360));
|
||||
long long lly = std::round(n * (1 - (log(tan(lat_rad) + 1 / cos(lat_rad)) / M_PI)) / 2);
|
||||
|
||||
*x = llx;
|
||||
*y = lly;
|
||||
@@ -84,8 +84,8 @@ void epsg3857totile(double ix, double iy, int zoom, long long *x, long long *y)
|
||||
ix = 40000000.0;
|
||||
}
|
||||
|
||||
*x = ix * (1LL << 31) / 6378137.0 / M_PI + (1LL << 31);
|
||||
*y = ((1LL << 32) - 1) - (iy * (1LL << 31) / 6378137.0 / M_PI + (1LL << 31));
|
||||
*x = std::round(ix * (1LL << 31) / 6378137.0 / M_PI + (1LL << 31));
|
||||
*y = std::round(((1LL << 32) - 1) - (iy * (1LL << 31) / 6378137.0 / M_PI + (1LL << 31)));
|
||||
|
||||
if (zoom != 0) {
|
||||
*x = std::round((double) *x / (1LL << (32 - zoom)));
|
||||
|
||||
+35
-36
@@ -13,6 +13,7 @@
|
||||
#include "mvt.hpp"
|
||||
#include "milo/dtoa_milo.h"
|
||||
#include "errors.hpp"
|
||||
#include "serial.hpp"
|
||||
|
||||
const char *geometry_names[GEOM_TYPES] = {
|
||||
"Point",
|
||||
@@ -116,54 +117,52 @@ void parse_geometry(int t, json_object *j, drawvec &out, int op, const char *fna
|
||||
}
|
||||
}
|
||||
|
||||
void stringify_value(json_object *value, int &type, std::string &stringified, const char *reading, int line, json_object *feature) {
|
||||
// This is used to convert a JSON attribute value into a serial_val-style
|
||||
// type and stringified value. All numeric values, even if they are integers,
|
||||
// even integers that are too large to fit in a double but will still be
|
||||
// stringified with their original precision, are recorded here as mvt_double.
|
||||
serial_val stringify_value(json_object *value, const char *reading, int line, json_object *feature) {
|
||||
serial_val sv;
|
||||
|
||||
if (value != NULL) {
|
||||
int vt = value->type;
|
||||
std::string val;
|
||||
|
||||
if (vt == JSON_STRING) {
|
||||
val = value->value.string.string;
|
||||
} else if (vt == JSON_NUMBER) {
|
||||
if (value->value.number.large_unsigned != 0) {
|
||||
val = std::to_string(value->value.number.large_unsigned);
|
||||
} else if (value->value.number.large_signed != 0) {
|
||||
val = std::to_string(value->value.number.large_signed);
|
||||
} else {
|
||||
val = milo::dtoa_milo(value->value.number.number);
|
||||
}
|
||||
} else if (vt == JSON_TRUE) {
|
||||
val = "true";
|
||||
} else if (vt == JSON_FALSE) {
|
||||
val = "false";
|
||||
} else if (vt == JSON_NULL) {
|
||||
val = "null";
|
||||
} else {
|
||||
const char *v = json_stringify(value);
|
||||
val = std::string(v);
|
||||
free((void *) v); // stringify
|
||||
}
|
||||
sv.type = mvt_string;
|
||||
sv.s = value->value.string.string;
|
||||
|
||||
if (vt == JSON_STRING) {
|
||||
type = mvt_string;
|
||||
stringified = val;
|
||||
std::string err = check_utf8(val);
|
||||
if (err != "") {
|
||||
std::string err = check_utf8(sv.s);
|
||||
if (err.size() > 0) {
|
||||
fprintf(stderr, "%s:%d: %s: ", reading, line, err.c_str());
|
||||
json_context(feature);
|
||||
exit(EXIT_UTF8);
|
||||
}
|
||||
} else if (vt == JSON_NUMBER) {
|
||||
type = mvt_double;
|
||||
stringified = val;
|
||||
} else if (vt == JSON_TRUE || vt == JSON_FALSE) {
|
||||
type = mvt_bool;
|
||||
stringified = val;
|
||||
sv.type = mvt_double;
|
||||
|
||||
if (value->value.number.large_unsigned != 0) {
|
||||
sv.s = std::to_string(value->value.number.large_unsigned);
|
||||
} else if (value->value.number.large_signed != 0) {
|
||||
sv.s = std::to_string(value->value.number.large_signed);
|
||||
} else {
|
||||
sv.s = milo::dtoa_milo(value->value.number.number);
|
||||
}
|
||||
} else if (vt == JSON_TRUE) {
|
||||
sv.type = mvt_bool;
|
||||
sv.s = "true";
|
||||
} else if (vt == JSON_FALSE) {
|
||||
sv.type = mvt_bool;
|
||||
sv.s = "false";
|
||||
} else if (vt == JSON_NULL) {
|
||||
type = mvt_null;
|
||||
stringified = "null";
|
||||
sv.type = mvt_null;
|
||||
sv.s = "null";
|
||||
} else {
|
||||
type = mvt_string;
|
||||
stringified = val;
|
||||
sv.type = mvt_string;
|
||||
const char *v = json_stringify(value);
|
||||
sv.s = std::string(v);
|
||||
free((void *) v); // stringify
|
||||
}
|
||||
}
|
||||
|
||||
return sv;
|
||||
}
|
||||
|
||||
+1
-1
@@ -13,4 +13,4 @@ extern int mb_geometry[GEOM_TYPES];
|
||||
void json_context(json_object *j);
|
||||
void parse_geometry(int t, json_object *j, drawvec &out, int op, const char *fname, int line, json_object *feature);
|
||||
|
||||
void stringify_value(json_object *value, int &type, std::string &stringified, const char *reading, int line, json_object *feature);
|
||||
serial_val stringify_value(json_object *value, const char *reading, int line, json_object *feature);
|
||||
|
||||
+200
-83
@@ -52,25 +52,16 @@ void serialize_long_long(FILE *out, long long n, std::atomic<long long> *fpos, c
|
||||
}
|
||||
|
||||
void serialize_ulong_long(FILE *out, unsigned long long zigzag, std::atomic<long long> *fpos, const char *fname) {
|
||||
while (1) {
|
||||
unsigned char b = zigzag & 0x7F;
|
||||
if ((zigzag >> 7) != 0) {
|
||||
b |= 0x80;
|
||||
if (putc(b, out) == EOF) {
|
||||
fprintf(stderr, "%s: Write to temporary file failed: %s\n", fname, strerror(errno));
|
||||
exit(EXIT_WRITE);
|
||||
}
|
||||
*fpos += 1;
|
||||
zigzag >>= 7;
|
||||
} else {
|
||||
if (putc(b, out) == EOF) {
|
||||
fprintf(stderr, "%s: Write to temporary file failed: %s\n", fname, strerror(errno));
|
||||
exit(EXIT_WRITE);
|
||||
}
|
||||
*fpos += 1;
|
||||
break;
|
||||
}
|
||||
char buf[10]; // ceil(64 / 7)
|
||||
char *s = buf;
|
||||
|
||||
while (zigzag >= 0x80) {
|
||||
*s++ = (zigzag & 0x7F) | 0x80;
|
||||
zigzag >>= 7;
|
||||
}
|
||||
|
||||
*s++ = zigzag;
|
||||
fwrite_check(buf, sizeof(char), s - buf, out, fpos, fname);
|
||||
}
|
||||
|
||||
void serialize_byte(FILE *out, signed char n, std::atomic<long long> *fpos, const char *fname) {
|
||||
@@ -89,17 +80,16 @@ size_t fwrite_check(const void *ptr, size_t size, size_t nitems, std::string &st
|
||||
}
|
||||
|
||||
void serialize_ulong_long(std::string &out, unsigned long long zigzag) {
|
||||
while (1) {
|
||||
unsigned char b = zigzag & 0x7F;
|
||||
if ((zigzag >> 7) != 0) {
|
||||
b |= 0x80;
|
||||
out += b;
|
||||
zigzag >>= 7;
|
||||
} else {
|
||||
out += b;
|
||||
break;
|
||||
}
|
||||
char buf[10]; // ceil(64 / 7)
|
||||
char *s = buf;
|
||||
|
||||
while (zigzag >= 0x80) {
|
||||
*s++ = (zigzag & 0x7F) | 0x80;
|
||||
zigzag >>= 7;
|
||||
}
|
||||
|
||||
*s++ = zigzag;
|
||||
out.append(buf, s - buf);
|
||||
}
|
||||
|
||||
void serialize_long_long(std::string &out, long long n) {
|
||||
@@ -122,43 +112,43 @@ void serialize_uint(std::string &out, unsigned n) {
|
||||
|
||||
// read from memory
|
||||
|
||||
void deserialize_int(char **f, int *n) {
|
||||
void deserialize_int(const char **f, int *n) {
|
||||
long long ll;
|
||||
deserialize_long_long(f, &ll);
|
||||
*n = ll;
|
||||
}
|
||||
|
||||
void deserialize_long_long(char **f, long long *n) {
|
||||
void deserialize_long_long(const char **f, long long *n) {
|
||||
unsigned long long zigzag = 0;
|
||||
deserialize_ulong_long(f, &zigzag);
|
||||
*n = protozero::decode_zigzag64(zigzag);
|
||||
}
|
||||
|
||||
void deserialize_ulong_long(char **f, unsigned long long *zigzag) {
|
||||
void deserialize_ulong_long(const char **f, unsigned long long *zigzag) {
|
||||
*zigzag = 0;
|
||||
int shift = 0;
|
||||
|
||||
while (1) {
|
||||
if ((**f & 0x80) == 0) {
|
||||
*zigzag |= ((unsigned long long) **f) << shift;
|
||||
*zigzag |= ((const unsigned long long) **f) << shift;
|
||||
*f += 1;
|
||||
shift += 7;
|
||||
break;
|
||||
} else {
|
||||
*zigzag |= ((unsigned long long) (**f & 0x7F)) << shift;
|
||||
*zigzag |= ((const unsigned long long) (**f & 0x7F)) << shift;
|
||||
*f += 1;
|
||||
shift += 7;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void deserialize_uint(char **f, unsigned *n) {
|
||||
void deserialize_uint(const char **f, unsigned *n) {
|
||||
unsigned long long v;
|
||||
deserialize_ulong_long(f, &v);
|
||||
*n = v;
|
||||
}
|
||||
|
||||
void deserialize_byte(char **f, signed char *n) {
|
||||
void deserialize_byte(const char **f, signed char *n) {
|
||||
memcpy(n, *f, sizeof(signed char));
|
||||
*f += sizeof(signed char);
|
||||
}
|
||||
@@ -187,7 +177,6 @@ std::string serialize_feature(serial_feature *sf, long long wx, long long wy) {
|
||||
#define FLAG_LAYER 7
|
||||
|
||||
#define FLAG_LABEL_POINT 6
|
||||
#define FLAG_SEQ 5
|
||||
#define FLAG_INDEX 4
|
||||
#define FLAG_EXTENT 3
|
||||
#define FLAG_ID 2
|
||||
@@ -197,21 +186,18 @@ std::string serialize_feature(serial_feature *sf, long long wx, long long wy) {
|
||||
long long layer = 0;
|
||||
layer |= sf->layer << FLAG_LAYER;
|
||||
layer |= (sf->label_point != 0) << FLAG_LABEL_POINT;
|
||||
layer |= (sf->seq != 0) << FLAG_SEQ;
|
||||
layer |= (sf->index != 0) << FLAG_INDEX;
|
||||
layer |= (sf->extent != 0) << FLAG_EXTENT;
|
||||
layer |= sf->has_id << FLAG_ID;
|
||||
layer |= sf->has_tippecanoe_minzoom << FLAG_MINZOOM;
|
||||
layer |= sf->has_tippecanoe_maxzoom << FLAG_MAXZOOM;
|
||||
layer |= (sf->tippecanoe_minzoom != -1) << FLAG_MINZOOM;
|
||||
layer |= (sf->tippecanoe_maxzoom != -1) << FLAG_MAXZOOM;
|
||||
|
||||
serialize_long_long(s, layer);
|
||||
if (sf->seq != 0) {
|
||||
serialize_long_long(s, sf->seq);
|
||||
}
|
||||
if (sf->has_tippecanoe_minzoom) {
|
||||
serialize_long_long(s, sf->seq);
|
||||
if (sf->tippecanoe_minzoom != -1) {
|
||||
serialize_int(s, sf->tippecanoe_minzoom);
|
||||
}
|
||||
if (sf->has_tippecanoe_maxzoom) {
|
||||
if (sf->tippecanoe_maxzoom != -1) {
|
||||
serialize_int(s, sf->tippecanoe_maxzoom);
|
||||
}
|
||||
if (sf->has_id) {
|
||||
@@ -244,17 +230,15 @@ std::string serialize_feature(serial_feature *sf, long long wx, long long wy) {
|
||||
return s;
|
||||
}
|
||||
|
||||
serial_feature deserialize_feature(std::string &geoms, unsigned z, unsigned tx, unsigned ty, unsigned *initial_x, unsigned *initial_y) {
|
||||
serial_feature deserialize_feature(std::string const &geoms, unsigned z, unsigned tx, unsigned ty, unsigned *initial_x, unsigned *initial_y) {
|
||||
serial_feature sf;
|
||||
char *cp = (char *) geoms.c_str();
|
||||
const char *cp = geoms.c_str();
|
||||
|
||||
deserialize_byte(&cp, &sf.t);
|
||||
deserialize_long_long(&cp, &sf.layer);
|
||||
|
||||
sf.seq = 0;
|
||||
if (sf.layer & (1 << FLAG_SEQ)) {
|
||||
deserialize_long_long(&cp, &sf.seq);
|
||||
}
|
||||
deserialize_long_long(&cp, &sf.seq);
|
||||
|
||||
sf.tippecanoe_minzoom = -1;
|
||||
sf.tippecanoe_maxzoom = -1;
|
||||
@@ -325,19 +309,27 @@ static long long scale_geometry(struct serialization_state *sst, long long *bbox
|
||||
long long y = geom[i].y;
|
||||
|
||||
if (additional[A_DETECT_WRAPAROUND]) {
|
||||
x += offset;
|
||||
if (has_prev) {
|
||||
if (x - prev > (1LL << 31)) {
|
||||
offset -= 1LL << 32;
|
||||
x -= 1LL << 32;
|
||||
} else if (prev - x > (1LL << 31)) {
|
||||
offset += 1LL << 32;
|
||||
x += 1LL << 32;
|
||||
if (geom[i].op == VT_LINETO) {
|
||||
x += offset;
|
||||
if (has_prev) {
|
||||
// jumps at least 180° but not exactly 360°,
|
||||
// which in some data sets is an intentional
|
||||
// line across the world
|
||||
if (x - prev > (1LL << 31) && x - prev != (1LL << 32)) {
|
||||
offset -= 1LL << 32;
|
||||
x -= 1LL << 32;
|
||||
} else if (prev - x > (1LL << 31) && prev - x != (1LL << 32)) {
|
||||
offset += 1LL << 32;
|
||||
x += 1LL << 32;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
has_prev = true;
|
||||
prev = x;
|
||||
has_prev = true;
|
||||
prev = x;
|
||||
} else {
|
||||
offset = 0;
|
||||
prev = x;
|
||||
}
|
||||
}
|
||||
|
||||
if (x < bbox[0]) {
|
||||
@@ -393,8 +385,31 @@ static std::string strip_zeroes(std::string s) {
|
||||
return s;
|
||||
}
|
||||
|
||||
int nodecmp(const void *void1, const void *void2) {
|
||||
node *n1 = (node *) void1;
|
||||
node *n2 = (node *) void2;
|
||||
|
||||
if (n1->index < n2->index) {
|
||||
return -1;
|
||||
} else if (n1->index > n2->index) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void add_scaled_node(struct reader *r, serialization_state *sst, draw g) {
|
||||
long long x = SHIFT_LEFT(g.x);
|
||||
long long y = SHIFT_LEFT(g.y);
|
||||
|
||||
struct node n;
|
||||
n.index = encode_quadkey((unsigned) x, (unsigned) y);
|
||||
|
||||
fwrite_check((char *) &n, sizeof(struct node), 1, r->nodefile, &r->nodepos, sst->fname);
|
||||
}
|
||||
|
||||
// called from frontends
|
||||
int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
|
||||
int serialize_feature(struct serialization_state *sst, serial_feature &sf, std::string const &layername) {
|
||||
struct reader *r = &(*sst->readers)[sst->segment];
|
||||
|
||||
sf.bbox[0] = LLONG_MAX;
|
||||
@@ -443,14 +458,15 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
|
||||
|
||||
for (auto &c : clipbboxes) {
|
||||
if (sf.t == VT_POLYGON) {
|
||||
scaled_geometry = simple_clip_poly(scaled_geometry, SHIFT_RIGHT(c.minx), SHIFT_RIGHT(c.miny), SHIFT_RIGHT(c.maxx), SHIFT_RIGHT(c.maxy));
|
||||
scaled_geometry = simple_clip_poly(scaled_geometry, SHIFT_RIGHT(c.minx), SHIFT_RIGHT(c.miny), SHIFT_RIGHT(c.maxx), SHIFT_RIGHT(c.maxy), prevent[P_SIMPLIFY_SHARED_NODES]);
|
||||
} else if (sf.t == VT_LINE) {
|
||||
scaled_geometry = clip_lines(scaled_geometry, SHIFT_RIGHT(c.minx), SHIFT_RIGHT(c.miny), SHIFT_RIGHT(c.maxx), SHIFT_RIGHT(c.maxy));
|
||||
scaled_geometry = remove_noop(scaled_geometry, sf.t, 0);
|
||||
} else if (sf.t == VT_POINT) {
|
||||
scaled_geometry = clip_point(scaled_geometry, SHIFT_RIGHT(c.minx), SHIFT_RIGHT(c.miny), SHIFT_RIGHT(c.maxx), SHIFT_RIGHT(c.maxy));
|
||||
}
|
||||
|
||||
scaled_geometry = remove_noop(scaled_geometry, sf.t, 0);
|
||||
|
||||
sf.bbox[0] = LLONG_MAX;
|
||||
sf.bbox[1] = LLONG_MAX;
|
||||
sf.bbox[2] = LLONG_MIN;
|
||||
@@ -480,6 +496,100 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (prevent[P_SIMPLIFY_SHARED_NODES]) {
|
||||
scaled_geometry = remove_noop(scaled_geometry, sf.t, 0);
|
||||
|
||||
if (sf.t == VT_POLYGON || sf.t == VT_LINE) {
|
||||
for (size_t i = 0; i < scaled_geometry.size(); i++) {
|
||||
if (scaled_geometry[i].op == VT_MOVETO) {
|
||||
size_t j;
|
||||
|
||||
for (j = i + 1; j < scaled_geometry.size(); j++) {
|
||||
if (scaled_geometry[j].op != VT_LINETO) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (sf.t == VT_POLYGON && j - i >= 4) {
|
||||
for (size_t k = i; k < j - 1; k++) {
|
||||
// % (j - i - 1) because we don't want the duplicate last point
|
||||
|
||||
struct vertex v(
|
||||
scaled_geometry[(k - i + 0) % (j - i - 1) + i],
|
||||
scaled_geometry[(k - i + 1) % (j - i - 1) + i],
|
||||
scaled_geometry[(k - i + 2) % (j - i - 1) + i]);
|
||||
|
||||
fwrite_check((char *) &v, sizeof(struct vertex), 1, r->vertexfile, &r->vertexpos, sst->fname);
|
||||
}
|
||||
} else if (sf.t == VT_LINE && j - i >= 2) {
|
||||
for (size_t k = i; k + 2 < j; k++) {
|
||||
struct vertex v(
|
||||
scaled_geometry[k + 0],
|
||||
scaled_geometry[k + 1],
|
||||
scaled_geometry[k + 2]);
|
||||
|
||||
fwrite_check((char *) &v, sizeof(struct vertex), 1, r->vertexfile, &r->vertexpos, sst->fname);
|
||||
}
|
||||
}
|
||||
|
||||
// since the starting point is never simplified away,
|
||||
// don't let it be simplified away in any other polygons either.
|
||||
// Needs to appear twice here so that the check below will see
|
||||
// it as appearing in multiple features.
|
||||
add_scaled_node(r, sst, scaled_geometry[i]);
|
||||
|
||||
if (sf.t == VT_LINE && j - i >= 2) {
|
||||
// linestrings also need to preserve the last point
|
||||
|
||||
add_scaled_node(r, sst, scaled_geometry[j - 1]);
|
||||
} else if (sf.t == VT_POLYGON && j - i >= 4) {
|
||||
// To avoid letting polygons get simplified away to nothing,
|
||||
// also keep the furthest-away point from the initial point
|
||||
// (which Douglas-Peucker simplification would keep anyway,
|
||||
// if its search weren't being split up by polygon side).
|
||||
|
||||
double far = 0;
|
||||
size_t which = i;
|
||||
for (size_t k = i + 1; k < j - 1; k++) {
|
||||
double xd = scaled_geometry[k].x - scaled_geometry[i].x;
|
||||
double yd = scaled_geometry[k].y - scaled_geometry[i].y;
|
||||
double d = xd * xd + yd * yd;
|
||||
if (d > far ||
|
||||
((d == far) && (scaled_geometry[k] < scaled_geometry[which]))) {
|
||||
far = d;
|
||||
which = k;
|
||||
}
|
||||
}
|
||||
|
||||
add_scaled_node(r, sst, scaled_geometry[which]);
|
||||
|
||||
// And, likewise, the point most distant from those two points,
|
||||
// which probably would also be the one that Douglas-Peucker
|
||||
// would keep next.
|
||||
|
||||
far = 0;
|
||||
size_t which2 = i;
|
||||
|
||||
for (size_t k = i + 1; k < j - 1; k++) {
|
||||
double d = distance_from_line(scaled_geometry[k].x, scaled_geometry[k].y,
|
||||
scaled_geometry[i].x, scaled_geometry[i].y,
|
||||
scaled_geometry[which].x, scaled_geometry[which].y);
|
||||
if ((d > far) ||
|
||||
((d == far) && (scaled_geometry[k] < scaled_geometry[which2]))) {
|
||||
far = d;
|
||||
which2 = k;
|
||||
}
|
||||
}
|
||||
|
||||
add_scaled_node(r, sst, scaled_geometry[which2]);
|
||||
}
|
||||
|
||||
i = j - 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!sf.has_id) {
|
||||
if (additional[A_GENERATE_IDS]) {
|
||||
sf.has_id = true;
|
||||
@@ -494,7 +604,7 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
|
||||
locs.push_back(encode_index(SHIFT_LEFT(scaled_geometry[i].x), SHIFT_LEFT(scaled_geometry[i].y)));
|
||||
}
|
||||
}
|
||||
std::sort(locs.begin(), locs.end());
|
||||
std::stable_sort(locs.begin(), locs.end());
|
||||
size_t n = 0;
|
||||
double sum = 0;
|
||||
for (size_t i = 1; i < locs.size(); i++) {
|
||||
@@ -557,10 +667,6 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
|
||||
*(sst->area_sum) += extent;
|
||||
}
|
||||
|
||||
if (!prevent[P_INPUT_ORDER]) {
|
||||
sf.seq = 0;
|
||||
}
|
||||
|
||||
unsigned long long bbox_index;
|
||||
long long midx, midy;
|
||||
|
||||
@@ -583,7 +689,9 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
|
||||
for (size_t i = 0; i < scaled_geometry.size(); i++) {
|
||||
ix += scaled_geometry[i].x + scaled_geometry[i].y;
|
||||
}
|
||||
ix = ix % scaled_geometry.size();
|
||||
if (scaled_geometry.size() != 0) {
|
||||
ix = ix % scaled_geometry.size();
|
||||
}
|
||||
|
||||
// If off the edge of the plane, mask to bring it back into the addressable area
|
||||
midx = SHIFT_LEFT(scaled_geometry[ix].x) & ((1LL << 32) - 1);
|
||||
@@ -601,17 +709,30 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
|
||||
}
|
||||
}
|
||||
|
||||
if (additional[A_DROP_DENSEST_AS_NEEDED] || additional[A_COALESCE_DENSEST_AS_NEEDED] || additional[A_CLUSTER_DENSEST_AS_NEEDED] || additional[A_CALCULATE_FEATURE_DENSITY] || additional[A_DROP_SMALLEST_AS_NEEDED] || additional[A_COALESCE_SMALLEST_AS_NEEDED] || additional[A_INCREASE_GAMMA_AS_NEEDED] || additional[A_GENERATE_POLYGON_LABEL_POINTS] || sst->uses_gamma || cluster_distance != 0) {
|
||||
if (additional[A_DROP_DENSEST_AS_NEEDED] ||
|
||||
additional[A_COALESCE_DENSEST_AS_NEEDED] ||
|
||||
additional[A_CLUSTER_DENSEST_AS_NEEDED] ||
|
||||
additional[A_CALCULATE_FEATURE_DENSITY] ||
|
||||
additional[A_DROP_SMALLEST_AS_NEEDED] ||
|
||||
additional[A_COALESCE_SMALLEST_AS_NEEDED] ||
|
||||
additional[A_DROP_FRACTION_AS_NEEDED] ||
|
||||
additional[A_COALESCE_FRACTION_AS_NEEDED] ||
|
||||
prevent[P_DYNAMIC_DROP] ||
|
||||
additional[A_INCREASE_GAMMA_AS_NEEDED] ||
|
||||
additional[A_GENERATE_POLYGON_LABEL_POINTS] ||
|
||||
sst->uses_gamma ||
|
||||
retain_points_multiplier > 1 ||
|
||||
cluster_distance != 0) {
|
||||
sf.index = bbox_index;
|
||||
} else {
|
||||
sf.index = 0;
|
||||
}
|
||||
|
||||
if (sst->layermap->count(sf.layername) == 0) {
|
||||
sst->layermap->insert(std::pair<std::string, layermap_entry>(sf.layername, layermap_entry(sst->layermap->size())));
|
||||
if (sst->layermap->count(layername) == 0) {
|
||||
sst->layermap->emplace(layername, layermap_entry(sst->layermap->size()));
|
||||
}
|
||||
|
||||
auto ai = sst->layermap->find(sf.layername);
|
||||
auto ai = sst->layermap->find(layername);
|
||||
if (ai != sst->layermap->end()) {
|
||||
sf.layer = ai->second.id;
|
||||
|
||||
@@ -625,7 +746,7 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
fprintf(stderr, "Internal error: can't find layer name %s\n", sf.layername.c_str());
|
||||
fprintf(stderr, "Internal error: can't find layer name %s\n", layername.c_str());
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
@@ -709,18 +830,14 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
|
||||
|
||||
if (!sst->filters) {
|
||||
for (size_t i = 0; i < sf.full_keys.size(); i++) {
|
||||
type_and_string attrib;
|
||||
attrib.type = sf.full_values[i].type;
|
||||
attrib.string = sf.full_values[i].s;
|
||||
|
||||
auto fk = sst->layermap->find(sf.layername);
|
||||
add_to_file_keys(fk->second.file_keys, sf.full_keys[i], attrib);
|
||||
auto ts = sst->layermap->find(layername);
|
||||
add_to_tilestats(ts->second.tilestats, sf.full_keys[i], sf.full_values[i]);
|
||||
}
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < sf.full_keys.size(); i++) {
|
||||
sf.keys.push_back(addpool(r->poolfile, r->treefile, sf.full_keys[i].c_str(), mvt_string));
|
||||
sf.values.push_back(addpool(r->poolfile, r->treefile, sf.full_values[i].s.c_str(), sf.full_values[i].type));
|
||||
sf.keys.push_back(addpool(r->poolfile, r->treefile, sf.full_keys[i].c_str(), mvt_string, r->key_dedup));
|
||||
sf.values.push_back(addpool(r->poolfile, r->treefile, sf.full_values[i].s.c_str(), sf.full_values[i].type, r->value_dedup));
|
||||
}
|
||||
|
||||
long long geomstart = r->geompos;
|
||||
@@ -764,7 +881,7 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
void coerce_value(std::string const &key, int &vt, std::string &val, std::map<std::string, int> const *attribute_types) {
|
||||
void coerce_value(std::string const &key, int &vt, std::string &val, std::unordered_map<std::string, int> const *attribute_types) {
|
||||
auto a = (*attribute_types).find(key);
|
||||
if (a != attribute_types->end()) {
|
||||
if (a->second == mvt_string) {
|
||||
|
||||
+137
-24
@@ -25,15 +25,30 @@ void serialize_ulong_long(std::string &out, unsigned long long n);
|
||||
void serialize_byte(std::string &out, signed char n);
|
||||
void serialize_uint(std::string &out, unsigned n);
|
||||
|
||||
void deserialize_int(char **f, int *n);
|
||||
void deserialize_long_long(char **f, long long *n);
|
||||
void deserialize_ulong_long(char **f, unsigned long long *n);
|
||||
void deserialize_uint(char **f, unsigned *n);
|
||||
void deserialize_byte(char **f, signed char *n);
|
||||
void deserialize_int(const char **f, int *n);
|
||||
void deserialize_long_long(const char **f, long long *n);
|
||||
void deserialize_ulong_long(const char **f, unsigned long long *n);
|
||||
void deserialize_uint(const char **f, unsigned *n);
|
||||
void deserialize_byte(const char **f, signed char *n);
|
||||
|
||||
// This is the main representation of attribute values in memory and
|
||||
// in the string pool. The type is one of the mvt_value type (mvt_string,
|
||||
// mvt_double, mvt_bool, or mvt_null). Note that all numeric values,
|
||||
// whether integer or floating point, use mvt_double here.
|
||||
struct serial_val {
|
||||
int type = 0;
|
||||
std::string s = "";
|
||||
int type;
|
||||
std::string s;
|
||||
|
||||
bool operator<(const serial_val &o) const;
|
||||
bool operator!=(const serial_val &o) const;
|
||||
|
||||
serial_val() {
|
||||
type = 0;
|
||||
}
|
||||
|
||||
serial_val(int t, const std::string &val)
|
||||
: type(t), s(val) {
|
||||
}
|
||||
};
|
||||
|
||||
struct serial_feature {
|
||||
@@ -47,56 +62,98 @@ struct serial_feature {
|
||||
bool has_id = false;
|
||||
unsigned long long id = 0;
|
||||
|
||||
bool has_tippecanoe_minzoom = false;
|
||||
int tippecanoe_minzoom = 0;
|
||||
|
||||
bool has_tippecanoe_maxzoom = false;
|
||||
int tippecanoe_maxzoom = 0;
|
||||
int tippecanoe_minzoom = -1;
|
||||
int tippecanoe_maxzoom = -1;
|
||||
|
||||
drawvec geometry = drawvec();
|
||||
unsigned long long index = 0;
|
||||
unsigned long long label_point = 0;
|
||||
long long extent = 0;
|
||||
|
||||
// These fields are not directly serialized, but are used
|
||||
// to create the keys and values references into the string pool
|
||||
// during initial serialization
|
||||
|
||||
std::vector<std::string> full_keys{};
|
||||
std::vector<serial_val> full_values{};
|
||||
|
||||
// These fields are generated from full_keys and full_values
|
||||
// during initial serialization and then replace the string
|
||||
// representations:
|
||||
|
||||
std::vector<long long> keys{};
|
||||
std::vector<long long> values{};
|
||||
|
||||
// XXX This isn't serialized. Should it be here?
|
||||
// These fields are used during tiling,
|
||||
// but are not serialized and are not expected
|
||||
// to be provided by frontends:
|
||||
|
||||
long long bbox[4] = {0, 0, 0, 0};
|
||||
std::vector<std::string> full_keys{};
|
||||
std::vector<serial_val> full_values{};
|
||||
std::string layername = "";
|
||||
bool dropped = false;
|
||||
drawvec edge_nodes; // what nodes at the tile edge were added during clipping?
|
||||
|
||||
#define FEATURE_DROPPED -1
|
||||
#define FEATURE_KEPT 0
|
||||
// <0: dropped
|
||||
// 0: kept
|
||||
// >0: sequence number of additional feature kept by retain-points-multiplier
|
||||
int dropped = FEATURE_DROPPED; // was this feature dropped by rate?
|
||||
|
||||
// unsigned long long drop_by; // dot-dropping priority
|
||||
bool reduced; // is polygon dust
|
||||
bool coalesced; // was coalesced from multiple features
|
||||
int line_detail; // current tile resolution being used for simplification
|
||||
int extra_detail; // extra tile resolution to retain in output
|
||||
int maxzoom;
|
||||
double spacing; // feature spacing for --calculate-feature-density
|
||||
double simplification; // simplification level at this zoom level
|
||||
std::vector<ssize_t> arc_polygon; // used in --detect-shared-borders
|
||||
ssize_t renamed; // used in --detect-shared-borders logic
|
||||
long long clustered; // does this feature need the clustered/point_count attributes?
|
||||
const char *stringpool; // string pool for keys/values lookup
|
||||
std::shared_ptr<std::string> tile_stringpool; // string pool for mvt_value construction
|
||||
std::set<std::string> need_tilestats;
|
||||
std::unordered_map<std::string, accum_state> attribute_accum_state;
|
||||
|
||||
int z; // tile being produced
|
||||
int tx;
|
||||
int ty;
|
||||
};
|
||||
|
||||
std::string serialize_feature(serial_feature *sf, long long wx, long long wy);
|
||||
serial_feature deserialize_feature(std::string &geoms, unsigned z, unsigned tx, unsigned ty, unsigned *initial_x, unsigned *initial_y);
|
||||
serial_feature deserialize_feature(std::string const &geoms, unsigned z, unsigned tx, unsigned ty, unsigned *initial_x, unsigned *initial_y);
|
||||
|
||||
struct reader {
|
||||
int poolfd = -1;
|
||||
int treefd = -1;
|
||||
int geomfd = -1;
|
||||
int indexfd = -1;
|
||||
int vertexfd = -1;
|
||||
int nodefd = -1;
|
||||
|
||||
struct memfile *poolfile = NULL;
|
||||
struct memfile *treefile = NULL;
|
||||
FILE *geomfile = NULL;
|
||||
FILE *indexfile = NULL;
|
||||
FILE *vertexfile = NULL;
|
||||
FILE *nodefile = NULL;
|
||||
|
||||
std::atomic<long long> geompos;
|
||||
std::atomic<long long> indexpos;
|
||||
std::atomic<long long> vertexpos;
|
||||
std::atomic<long long> nodepos;
|
||||
|
||||
long long file_bbox[4] = {0, 0, 0, 0};
|
||||
|
||||
long long file_bbox1[4] = {0xFFFFFFFF, 0xFFFFFFFF, 0, 0}; // standard -180 to 180 world plane
|
||||
long long file_bbox2[4] = {0x1FFFFFFFF, 0xFFFFFFFF, 0x100000000, 0}; // 0 to 360 world plane
|
||||
|
||||
struct stat geomst {};
|
||||
|
||||
char *geom_map = NULL;
|
||||
|
||||
std::vector<ssize_t> key_dedup = std::vector<ssize_t>(655536, -1);
|
||||
std::vector<ssize_t> value_dedup = std::vector<ssize_t>(655536, -1);
|
||||
|
||||
reader()
|
||||
: geompos(0), indexpos(0) {
|
||||
: geompos(0), indexpos(0), vertexpos(0), nodepos(0) {
|
||||
}
|
||||
|
||||
reader(reader const &r) {
|
||||
@@ -104,11 +161,15 @@ struct reader {
|
||||
treefd = r.treefd;
|
||||
geomfd = r.geomfd;
|
||||
indexfd = r.indexfd;
|
||||
vertexfd = r.vertexfd;
|
||||
nodefd = r.nodefd;
|
||||
|
||||
poolfile = r.poolfile;
|
||||
treefile = r.treefile;
|
||||
geomfile = r.geomfile;
|
||||
indexfile = r.indexfile;
|
||||
vertexfile = r.vertexfile;
|
||||
nodefile = r.nodefile;
|
||||
|
||||
long long p = r.geompos;
|
||||
geompos = p;
|
||||
@@ -116,6 +177,12 @@ struct reader {
|
||||
p = r.indexpos;
|
||||
indexpos = p;
|
||||
|
||||
p = r.vertexpos;
|
||||
vertexpos = p;
|
||||
|
||||
p = r.nodepos;
|
||||
nodepos = p;
|
||||
|
||||
memcpy(file_bbox, r.file_bbox, sizeof(file_bbox));
|
||||
|
||||
geomst = r.geomst;
|
||||
@@ -151,13 +218,59 @@ struct serialization_state {
|
||||
|
||||
std::map<std::string, layermap_entry> *layermap = NULL;
|
||||
|
||||
std::map<std::string, int> const *attribute_types = NULL;
|
||||
std::unordered_map<std::string, int> const *attribute_types = NULL;
|
||||
std::set<std::string> *exclude = NULL;
|
||||
std::set<std::string> *include = NULL;
|
||||
int exclude_all = 0;
|
||||
};
|
||||
|
||||
int serialize_feature(struct serialization_state *sst, serial_feature &sf);
|
||||
void coerce_value(std::string const &key, int &vt, std::string &val, std::map<std::string, int> const *attribute_types);
|
||||
struct vertex {
|
||||
// these are scaled geometry,
|
||||
// but because scaling is disabled if P_SHARED_NODES is set,
|
||||
// they are effectively also world coordinates
|
||||
draw p1;
|
||||
draw mid;
|
||||
draw p2;
|
||||
|
||||
vertex(draw one, draw joint, draw two) {
|
||||
if (one < two) {
|
||||
p1 = one;
|
||||
p2 = two;
|
||||
} else {
|
||||
p1 = two;
|
||||
p2 = one;
|
||||
}
|
||||
|
||||
mid = joint;
|
||||
}
|
||||
|
||||
bool operator<(const vertex &v) const {
|
||||
if (mid < v.mid) {
|
||||
return true;
|
||||
} else if (mid == v.mid) {
|
||||
if (p1 < v.p1) {
|
||||
return true;
|
||||
} else if (p1 == v.p1) {
|
||||
if (p2 < v.p2) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
struct node {
|
||||
// this is in quadkey coordinates so that the nodes for each tile
|
||||
// will be adjacent in memory, reducing potential thrashing during
|
||||
// the binary search.
|
||||
unsigned long long index;
|
||||
};
|
||||
|
||||
int nodecmp(const void *void1, const void *void2);
|
||||
|
||||
int serialize_feature(struct serialization_state *sst, serial_feature &sf, std::string const &layername);
|
||||
void coerce_value(std::string const &key, int &vt, std::string &val, std::unordered_map<std::string, int> const *attribute_types);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,575 @@
|
||||
#include <stdio.h>
|
||||
#include <algorithm>
|
||||
#include "geometry.hpp"
|
||||
#include "serial.hpp"
|
||||
#include "options.hpp"
|
||||
|
||||
// This should all be removed and replaced with --no-simplification-of-shared-nodes
|
||||
|
||||
// Does not fix up moveto/lineto
|
||||
static drawvec reverse_subring(drawvec const &dv) {
|
||||
drawvec out;
|
||||
|
||||
for (size_t i = dv.size(); i > 0; i--) {
|
||||
out.push_back(dv[i - 1]);
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
struct edge {
|
||||
unsigned x1 = 0;
|
||||
unsigned y1 = 0;
|
||||
unsigned x2 = 0;
|
||||
unsigned y2 = 0;
|
||||
unsigned ring = 0;
|
||||
|
||||
edge(unsigned _x1, unsigned _y1, unsigned _x2, unsigned _y2, unsigned _ring) {
|
||||
x1 = _x1;
|
||||
y1 = _y1;
|
||||
x2 = _x2;
|
||||
y2 = _y2;
|
||||
ring = _ring;
|
||||
}
|
||||
|
||||
bool operator<(const edge &s) const {
|
||||
long long cmp = (long long) y1 - s.y1;
|
||||
if (cmp == 0) {
|
||||
cmp = (long long) x1 - s.x1;
|
||||
}
|
||||
if (cmp == 0) {
|
||||
cmp = (long long) y2 - s.y2;
|
||||
}
|
||||
if (cmp == 0) {
|
||||
cmp = (long long) x2 - s.x2;
|
||||
}
|
||||
return cmp < 0;
|
||||
}
|
||||
};
|
||||
|
||||
struct edgecmp_ring {
|
||||
bool operator()(const edge &a, const edge &b) {
|
||||
long long cmp = (long long) a.y1 - b.y1;
|
||||
if (cmp == 0) {
|
||||
cmp = (long long) a.x1 - b.x1;
|
||||
}
|
||||
if (cmp == 0) {
|
||||
cmp = (long long) a.y2 - b.y2;
|
||||
}
|
||||
if (cmp == 0) {
|
||||
cmp = (long long) a.x2 - b.x2;
|
||||
}
|
||||
if (cmp == 0) {
|
||||
cmp = (long long) a.ring - b.ring;
|
||||
}
|
||||
return cmp < 0;
|
||||
}
|
||||
} edgecmp_ring;
|
||||
|
||||
bool edges_same(std::pair<std::vector<edge>::iterator, std::vector<edge>::iterator> e1, std::pair<std::vector<edge>::iterator, std::vector<edge>::iterator> e2) {
|
||||
if ((e2.second - e2.first) != (e1.second - e1.first)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
while (e1.first != e1.second) {
|
||||
if (e1.first->ring != e2.first->ring) {
|
||||
return false;
|
||||
}
|
||||
|
||||
++e1.first;
|
||||
++e2.first;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool find_common_edges(std::vector<serial_feature> &features, int z, int line_detail, double simplification, int maxzoom, double merge_fraction) {
|
||||
size_t merge_count = ceil((1 - merge_fraction) * features.size());
|
||||
|
||||
for (size_t i = 0; i < features.size(); i++) {
|
||||
if (features[i].t == VT_POLYGON) {
|
||||
{
|
||||
drawvec &g = features[i].geometry;
|
||||
drawvec out;
|
||||
|
||||
for (size_t k = 0; k < g.size(); k++) {
|
||||
if (g[k].op == VT_LINETO && k > 0 && g[k - 1] == g[k]) {
|
||||
;
|
||||
} else {
|
||||
out.push_back(g[k]);
|
||||
}
|
||||
}
|
||||
|
||||
features[i].geometry = out;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Construct a mapping from all polygon edges to the set of rings
|
||||
// that each edge appears in. (The ring number is across all polygons;
|
||||
// we don't need to look it back up, just to tell where it changes.)
|
||||
|
||||
std::vector<edge> edges;
|
||||
size_t ring = 0;
|
||||
for (size_t i = 0; i < features.size(); i++) {
|
||||
if (features[i].t == VT_POLYGON) {
|
||||
{
|
||||
for (size_t k = 0; k + 1 < features[i].geometry.size(); k++) {
|
||||
if (features[i].geometry[k].op == VT_MOVETO) {
|
||||
ring++;
|
||||
}
|
||||
|
||||
if (features[i].geometry[k + 1].op == VT_LINETO) {
|
||||
drawvec dv;
|
||||
if (features[i].geometry[k] < features[i].geometry[k + 1]) {
|
||||
dv.push_back(features[i].geometry[k]);
|
||||
dv.push_back(features[i].geometry[k + 1]);
|
||||
} else {
|
||||
dv.push_back(features[i].geometry[k + 1]);
|
||||
dv.push_back(features[i].geometry[k]);
|
||||
}
|
||||
|
||||
edges.push_back(edge(dv[0].x, dv[0].y, dv[1].x, dv[1].y, ring));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::stable_sort(edges.begin(), edges.end(), edgecmp_ring);
|
||||
std::set<draw> necessaries;
|
||||
|
||||
// Now mark all the points where the set of rings using the edge on one side
|
||||
// is not the same as the set of rings using the edge on the other side.
|
||||
|
||||
for (size_t i = 0; i < features.size(); i++) {
|
||||
if (features[i].t == VT_POLYGON) {
|
||||
{
|
||||
drawvec &g = features[i].geometry;
|
||||
|
||||
for (size_t k = 0; k < g.size(); k++) {
|
||||
g[k].necessary = 0;
|
||||
}
|
||||
|
||||
for (size_t a = 0; a < g.size(); a++) {
|
||||
if (g[a].op == VT_MOVETO) {
|
||||
size_t b;
|
||||
|
||||
for (b = a + 1; b < g.size(); b++) {
|
||||
if (g[b].op != VT_LINETO) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// -1 because of duplication at the end
|
||||
size_t s = b - a - 1;
|
||||
|
||||
if (s > 0) {
|
||||
drawvec left;
|
||||
if (g[a + (s - 1) % s] < g[a]) {
|
||||
left.push_back(g[a + (s - 1) % s]);
|
||||
left.push_back(g[a]);
|
||||
} else {
|
||||
left.push_back(g[a]);
|
||||
left.push_back(g[a + (s - 1) % s]);
|
||||
}
|
||||
if (left[1] < left[0]) {
|
||||
fprintf(stderr, "left misordered\n");
|
||||
}
|
||||
std::pair<std::vector<edge>::iterator, std::vector<edge>::iterator> e1 = std::equal_range(edges.begin(), edges.end(), edge(left[0].x, left[0].y, left[1].x, left[1].y, 0));
|
||||
|
||||
for (size_t k = 0; k < s; k++) {
|
||||
drawvec right;
|
||||
|
||||
if (g[a + k] < g[a + k + 1]) {
|
||||
right.push_back(g[a + k]);
|
||||
right.push_back(g[a + k + 1]);
|
||||
} else {
|
||||
right.push_back(g[a + k + 1]);
|
||||
right.push_back(g[a + k]);
|
||||
}
|
||||
|
||||
std::pair<std::vector<edge>::iterator, std::vector<edge>::iterator> e2 = std::equal_range(edges.begin(), edges.end(), edge(right[0].x, right[0].y, right[1].x, right[1].y, 0));
|
||||
|
||||
if (right[1] < right[0]) {
|
||||
fprintf(stderr, "left misordered\n");
|
||||
}
|
||||
|
||||
if (e1.first == e1.second || e2.first == e2.second) {
|
||||
fprintf(stderr, "Internal error: polygon edge lookup failed for %lld,%lld to %lld,%lld or %lld,%lld to %lld,%lld\n", left[0].x, left[0].y, left[1].x, left[1].y, right[0].x, right[0].y, right[1].x, right[1].y);
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
if (!edges_same(e1, e2)) {
|
||||
g[a + k].necessary = 1;
|
||||
necessaries.insert(g[a + k]);
|
||||
}
|
||||
|
||||
e1 = e2;
|
||||
}
|
||||
}
|
||||
|
||||
a = b - 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
edges.clear();
|
||||
std::map<drawvec, size_t> arcs;
|
||||
std::multimap<ssize_t, size_t> merge_candidates; // from arc to serial_feature
|
||||
|
||||
// Roll rings that include a necessary point around so they start at one
|
||||
|
||||
for (size_t i = 0; i < features.size(); i++) {
|
||||
if (features[i].t == VT_POLYGON) {
|
||||
{
|
||||
drawvec &g = features[i].geometry;
|
||||
|
||||
for (size_t k = 0; k < g.size(); k++) {
|
||||
if (necessaries.count(g[k]) != 0) {
|
||||
g[k].necessary = 1;
|
||||
}
|
||||
}
|
||||
|
||||
for (size_t k = 0; k < g.size(); k++) {
|
||||
if (g[k].op == VT_MOVETO) {
|
||||
ssize_t necessary = -1;
|
||||
ssize_t lowest = k;
|
||||
size_t l;
|
||||
for (l = k + 1; l < g.size(); l++) {
|
||||
if (g[l].op != VT_LINETO) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (g[l].necessary) {
|
||||
necessary = l;
|
||||
}
|
||||
if (g[l] < g[lowest]) {
|
||||
lowest = l;
|
||||
}
|
||||
}
|
||||
|
||||
if (necessary < 0) {
|
||||
necessary = lowest;
|
||||
// Add a necessary marker if there was none in the ring,
|
||||
// so the arc code below can find it.
|
||||
g[lowest].necessary = 1;
|
||||
}
|
||||
|
||||
{
|
||||
drawvec tmp;
|
||||
|
||||
// l - 1 because the endpoint is duplicated
|
||||
for (size_t m = necessary; m < l - 1; m++) {
|
||||
tmp.push_back(g[m]);
|
||||
}
|
||||
for (ssize_t m = k; m < necessary; m++) {
|
||||
tmp.push_back(g[m]);
|
||||
}
|
||||
|
||||
// replace the endpoint
|
||||
tmp.push_back(g[necessary]);
|
||||
|
||||
if (tmp.size() != l - k) {
|
||||
fprintf(stderr, "internal error shifting ring\n");
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
for (size_t m = 0; m < tmp.size(); m++) {
|
||||
if (m == 0) {
|
||||
tmp[m].op = VT_MOVETO;
|
||||
} else {
|
||||
tmp[m].op = VT_LINETO;
|
||||
}
|
||||
|
||||
g[k + m] = tmp[m];
|
||||
}
|
||||
}
|
||||
|
||||
// Now peel off each set of segments from one necessary point to the next
|
||||
// into an "arc" as in TopoJSON
|
||||
|
||||
for (size_t m = k; m < l; m++) {
|
||||
if (!g[m].necessary) {
|
||||
fprintf(stderr, "internal error in arc building\n");
|
||||
exit(EXIT_IMPOSSIBLE);
|
||||
}
|
||||
|
||||
drawvec arc;
|
||||
size_t n;
|
||||
for (n = m; n < l; n++) {
|
||||
arc.push_back(g[n]);
|
||||
if (n > m && g[n].necessary) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
auto f = arcs.find(arc);
|
||||
if (f == arcs.end()) {
|
||||
drawvec arc2 = reverse_subring(arc);
|
||||
|
||||
auto f2 = arcs.find(arc2);
|
||||
if (f2 == arcs.end()) {
|
||||
// Add new arc
|
||||
size_t added = arcs.size() + 1;
|
||||
arcs.insert(std::pair<drawvec, size_t>(arc, added));
|
||||
features[i].arc_polygon.push_back(added);
|
||||
merge_candidates.insert(std::pair<ssize_t, size_t>(added, i));
|
||||
} else {
|
||||
features[i].arc_polygon.push_back(-(ssize_t) f2->second);
|
||||
merge_candidates.insert(std::pair<ssize_t, size_t>(-(ssize_t) f2->second, i));
|
||||
}
|
||||
} else {
|
||||
features[i].arc_polygon.push_back(f->second);
|
||||
merge_candidates.insert(std::pair<ssize_t, size_t>(f->second, i));
|
||||
}
|
||||
|
||||
m = n - 1;
|
||||
}
|
||||
|
||||
features[i].arc_polygon.push_back(0);
|
||||
|
||||
k = l - 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Simplify each arc
|
||||
|
||||
std::vector<drawvec> simplified_arcs;
|
||||
|
||||
for (auto ai = arcs.begin(); ai != arcs.end(); ++ai) {
|
||||
if (simplified_arcs.size() < ai->second + 1) {
|
||||
simplified_arcs.resize(ai->second + 1);
|
||||
}
|
||||
|
||||
drawvec dv = ai->first;
|
||||
for (size_t i = 0; i < dv.size(); i++) {
|
||||
if (i == 0) {
|
||||
dv[i].op = VT_MOVETO;
|
||||
} else {
|
||||
dv[i].op = VT_LINETO;
|
||||
}
|
||||
}
|
||||
if (!(prevent[P_SIMPLIFY] || (z == maxzoom && prevent[P_SIMPLIFY_LOW]) || (z < maxzoom && additional[A_GRID_LOW_ZOOMS]))) {
|
||||
// tx and ty are 0 here because we aren't trying to do anything with the shared_nodes_map
|
||||
simplified_arcs[ai->second] = simplify_lines(dv, z, 0, 0, line_detail, !(prevent[P_CLIPPING] || prevent[P_DUPLICATION]), simplification, 4, drawvec(), NULL, 0);
|
||||
} else {
|
||||
simplified_arcs[ai->second] = dv;
|
||||
}
|
||||
}
|
||||
|
||||
// If necessary, merge some adjacent polygons into some other polygons
|
||||
|
||||
struct merge_order {
|
||||
ssize_t edge = 0;
|
||||
unsigned long long gap = 0;
|
||||
size_t p1 = 0;
|
||||
size_t p2 = 0;
|
||||
|
||||
bool operator<(const merge_order &m) const {
|
||||
return gap < m.gap;
|
||||
}
|
||||
};
|
||||
std::vector<merge_order> order;
|
||||
|
||||
for (ssize_t i = 0; i < (ssize_t) simplified_arcs.size(); i++) {
|
||||
auto r1 = merge_candidates.equal_range(i);
|
||||
for (auto r1i = r1.first; r1i != r1.second; ++r1i) {
|
||||
auto r2 = merge_candidates.equal_range(-i);
|
||||
for (auto r2i = r2.first; r2i != r2.second; ++r2i) {
|
||||
if (r1i->second != r2i->second) {
|
||||
merge_order mo;
|
||||
mo.edge = i;
|
||||
if (features[r1i->second].index > features[r2i->second].index) {
|
||||
mo.gap = features[r1i->second].index - features[r2i->second].index;
|
||||
} else {
|
||||
mo.gap = features[r2i->second].index - features[r1i->second].index;
|
||||
}
|
||||
mo.p1 = r1i->second;
|
||||
mo.p2 = r2i->second;
|
||||
order.push_back(mo);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
std::stable_sort(order.begin(), order.end());
|
||||
|
||||
size_t merged = 0;
|
||||
for (size_t o = 0; o < order.size(); o++) {
|
||||
if (merged >= merge_count) {
|
||||
break;
|
||||
}
|
||||
|
||||
size_t i = order[o].p1;
|
||||
while (features[i].renamed >= 0) {
|
||||
i = features[i].renamed;
|
||||
}
|
||||
size_t i2 = order[o].p2;
|
||||
while (features[i2].renamed >= 0) {
|
||||
i2 = features[i2].renamed;
|
||||
}
|
||||
|
||||
for (size_t j = 0; j < features[i].arc_polygon.size() && merged < merge_count; j++) {
|
||||
if (features[i].arc_polygon[j] == order[o].edge) {
|
||||
{
|
||||
// XXX snap links
|
||||
if (features[order[o].p2].arc_polygon.size() > 0) {
|
||||
// This has to merge the ring that contains the anti-arc to this arc
|
||||
// into the current ring, and then add whatever other rings were in
|
||||
// that feature on to the end.
|
||||
//
|
||||
// This can't be good for keeping parent-child relationships among
|
||||
// the rings in order, but Wagyu should sort that out later
|
||||
|
||||
std::vector<ssize_t> additions;
|
||||
std::vector<ssize_t> &here = features[i].arc_polygon;
|
||||
std::vector<ssize_t> &other = features[i2].arc_polygon;
|
||||
|
||||
#if 0
|
||||
printf("seeking %zd\n", features[i].arc_polygon[j]);
|
||||
printf("before: ");
|
||||
for (size_t k = 0; k < here.size(); k++) {
|
||||
printf("%zd ", here[k]);
|
||||
}
|
||||
printf("\n");
|
||||
printf("other: ");
|
||||
for (size_t k = 0; k < other.size(); k++) {
|
||||
printf("%zd ", other[k]);
|
||||
}
|
||||
printf("\n");
|
||||
#endif
|
||||
|
||||
for (size_t k = 0; k < other.size(); k++) {
|
||||
size_t l;
|
||||
for (l = k; l < other.size(); l++) {
|
||||
if (other[l] == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (l >= other.size()) {
|
||||
l--;
|
||||
}
|
||||
|
||||
#if 0
|
||||
for (size_t m = k; m <= l; m++) {
|
||||
printf("%zd ", other[m]);
|
||||
}
|
||||
printf("\n");
|
||||
#endif
|
||||
|
||||
size_t m;
|
||||
for (m = k; m <= l; m++) {
|
||||
if (other[m] == -features[i].arc_polygon[j]) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (m <= l) {
|
||||
// Found the shared arc
|
||||
|
||||
here.erase(here.begin() + j);
|
||||
|
||||
size_t off = 0;
|
||||
for (size_t n = m + 1; n < l; n++) {
|
||||
here.insert(here.begin() + j + off, other[n]);
|
||||
off++;
|
||||
}
|
||||
for (size_t n = k; n < m; n++) {
|
||||
here.insert(here.begin() + j + off, other[n]);
|
||||
off++;
|
||||
}
|
||||
} else {
|
||||
// Looking at some other ring
|
||||
|
||||
for (size_t n = k; n <= l; n++) {
|
||||
additions.push_back(other[n]);
|
||||
}
|
||||
}
|
||||
|
||||
k = l;
|
||||
}
|
||||
|
||||
features[i2].arc_polygon.clear();
|
||||
features[i2].renamed = i;
|
||||
merged++;
|
||||
|
||||
for (size_t k = 0; k < additions.size(); k++) {
|
||||
features[i].arc_polygon.push_back(additions[k]);
|
||||
}
|
||||
|
||||
#if 0
|
||||
printf("after: ");
|
||||
for (size_t k = 0; k < here.size(); k++) {
|
||||
printf("%zd ", here[k]);
|
||||
}
|
||||
printf("\n");
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
for (size_t k = 0; k + 1 < here.size(); k++) {
|
||||
if (here[k] != 0 && here[k + 1] != 0) {
|
||||
if (simplified_arcs[here[k + 1]][0] != simplified_arcs[here[k]][simplified_arcs[here[k]].size() - 1]) {
|
||||
printf("error from %zd to %zd\n", here[k], here[k + 1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Turn the arc representations of the polygons back into standard polygon geometries
|
||||
|
||||
for (size_t i = 0; i < features.size(); i++) {
|
||||
if (features[i].t == VT_POLYGON) {
|
||||
features[i].geometry.clear();
|
||||
bool at_start = true;
|
||||
draw first(-1, 0, 0);
|
||||
|
||||
for (size_t j = 0; j < features[i].arc_polygon.size(); j++) {
|
||||
ssize_t p = features[i].arc_polygon[j];
|
||||
|
||||
if (p == 0) {
|
||||
if (first.op >= 0) {
|
||||
features[i].geometry.push_back(first);
|
||||
first = draw(-1, 0, 0);
|
||||
}
|
||||
at_start = true;
|
||||
} else if (p > 0) {
|
||||
for (size_t k = 0; k + 1 < simplified_arcs[p].size(); k++) {
|
||||
if (at_start) {
|
||||
features[i].geometry.push_back(draw(VT_MOVETO, simplified_arcs[p][k].x, simplified_arcs[p][k].y));
|
||||
first = draw(VT_LINETO, simplified_arcs[p][k].x, simplified_arcs[p][k].y);
|
||||
} else {
|
||||
features[i].geometry.push_back(draw(VT_LINETO, simplified_arcs[p][k].x, simplified_arcs[p][k].y));
|
||||
}
|
||||
at_start = 0;
|
||||
}
|
||||
} else { /* p < 0 */
|
||||
for (ssize_t k = simplified_arcs[-p].size() - 1; k > 0; k--) {
|
||||
if (at_start) {
|
||||
features[i].geometry.push_back(draw(VT_MOVETO, simplified_arcs[-p][k].x, simplified_arcs[-p][k].y));
|
||||
first = draw(VT_LINETO, simplified_arcs[-p][k].x, simplified_arcs[-p][k].y);
|
||||
} else {
|
||||
features[i].geometry.push_back(draw(VT_LINETO, simplified_arcs[-p][k].x, simplified_arcs[-p][k].y));
|
||||
}
|
||||
at_start = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (merged >= merge_count) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
bool find_common_edges(std::vector<serial_feature> &features, int z, int line_detail, double simplification, int maxzoom, double merge_fraction);
|
||||
@@ -0,0 +1,127 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
#define MAX_MEMORY (1024 * 1024 * 1024) // 1 GB
|
||||
|
||||
void fqsort(std::vector<FILE *> &inputs, size_t width, int (*cmp)(const void *, const void *), FILE *out, size_t mem) {
|
||||
std::string pivot;
|
||||
FILE *fp1, *fp2;
|
||||
|
||||
if (mem > MAX_MEMORY) {
|
||||
mem = MAX_MEMORY;
|
||||
}
|
||||
|
||||
{
|
||||
// read some elements into memory to choose a pivot from
|
||||
//
|
||||
// this is in its own scope so `buf` can go out of scope
|
||||
// before trying to do any sub-sorts.
|
||||
|
||||
std::string buf;
|
||||
|
||||
bool read_everything = false;
|
||||
for (size_t i = 0; i < inputs.size(); i++) {
|
||||
if (buf.size() > mem) {
|
||||
break;
|
||||
}
|
||||
|
||||
while (true) {
|
||||
std::string element;
|
||||
element.resize(width);
|
||||
|
||||
size_t n = fread((void *) element.c_str(), width, 1, inputs[i]);
|
||||
if (n == 0) {
|
||||
if (i + 1 == inputs.size()) {
|
||||
read_everything = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
buf.append(element);
|
||||
|
||||
if (buf.size() > mem) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
qsort((void *) buf.c_str(), buf.size() / width, width, cmp);
|
||||
|
||||
// If that was everything we have to sort, we are done.
|
||||
|
||||
if (read_everything) {
|
||||
fwrite((void *) buf.c_str(), buf.size() / width, width, out);
|
||||
return;
|
||||
}
|
||||
|
||||
// Otherwise, choose a pivot from it, make some temporary files,
|
||||
// write what we have to those files, and then partition the rest
|
||||
// of the input into them.
|
||||
|
||||
// This would be unstable if the pivot is one of several elements
|
||||
// that compare equal. Does it matter?
|
||||
|
||||
size_t pivot_off = width * (buf.size() / width / 2);
|
||||
pivot = std::string(buf, pivot_off, width);
|
||||
|
||||
std::string t1 = "/tmp/sort1.XXXXXX";
|
||||
std::string t2 = "/tmp/sort2.XXXXXX";
|
||||
|
||||
int fd1 = mkstemp((char *) t1.c_str());
|
||||
unlink(t1.c_str());
|
||||
int fd2 = mkstemp((char *) t2.c_str());
|
||||
unlink(t2.c_str());
|
||||
|
||||
fp1 = fdopen(fd1, "w+b");
|
||||
if (fp1 == NULL) {
|
||||
perror(t1.c_str());
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
fp2 = fdopen(fd2, "w+b");
|
||||
if (fp2 == NULL) {
|
||||
perror(t2.c_str());
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
fwrite((void *) buf.c_str(), sizeof(char), pivot_off, fp1);
|
||||
fwrite((void *) ((char *) buf.c_str() + pivot_off), sizeof(char), buf.size() - pivot_off, fp2);
|
||||
}
|
||||
|
||||
// read the remaining input into the temporary files
|
||||
|
||||
for (size_t i = 0; i < inputs.size(); i++) {
|
||||
while (true) {
|
||||
std::string element;
|
||||
element.resize(width);
|
||||
|
||||
size_t n = fread((void *) element.c_str(), width, 1, inputs[i]);
|
||||
if (n == 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (cmp((void *) element.c_str(), (void *) pivot.c_str()) < 0) {
|
||||
fwrite((void *) element.c_str(), width, 1, fp1);
|
||||
} else {
|
||||
fwrite((void *) element.c_str(), width, 1, fp2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Now sort the sub-ranges into the output.
|
||||
|
||||
rewind(fp1);
|
||||
rewind(fp2);
|
||||
|
||||
std::vector<FILE *> v1;
|
||||
v1.emplace_back(fp1);
|
||||
fqsort(v1, width, cmp, out, mem);
|
||||
fclose(fp1);
|
||||
|
||||
std::vector<FILE *> v2;
|
||||
v2.emplace_back(fp2);
|
||||
fqsort(v2, width, cmp, out, mem);
|
||||
fclose(fp2);
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef SORT_HPP
|
||||
#define SORT_HPP
|
||||
|
||||
void fqsort(std::vector<FILE *> &inputs, size_t width, int (*cmp)(const void *, const void *), FILE *out, size_t mem);
|
||||
|
||||
#endif
|
||||
+4
-4
@@ -5337,7 +5337,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 13, "x": 1275, "y": 7544 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "thesum": 100, "themax": 100, "themin": 100, "theproduct": 100, "themean": 100, "theconcat": 100, "thecomma": "NEWVALUE" }, "geometry": { "type": "Point", "coordinates": [ -123.948516, -81.873970 ] } }
|
||||
{ "type": "Feature", "properties": { "thesum": 100, "themax": 100, "themin": 100, "theproduct": 100, "themean": 100, "theconcat": 100, "thecomma": "NEWVALUE" }, "geometry": { "type": "Point", "coordinates": [ -123.948505, -81.873970 ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -5481,7 +5481,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 13, "x": 4245, "y": 5238 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "thesum": 18, "themax": 18, "themin": 18, "theproduct": 18, "themean": 18, "theconcat": 18, "thecomma": "NEWVALUE" }, "geometry": { "type": "Point", "coordinates": [ 6.564438, -44.802834 ] } }
|
||||
{ "type": "Feature", "properties": { "thesum": 18, "themax": 18, "themin": 18, "theproduct": 18, "themean": 18, "theconcat": 18, "thecomma": "NEWVALUE" }, "geometry": { "type": "Point", "coordinates": [ 6.564438, -44.802842 ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -5889,7 +5889,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 14, "x": 2550, "y": 15088 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "thesum": 100, "themax": 100, "themin": 100, "theproduct": 100, "themean": 100, "theconcat": 100, "thecomma": "NEWVALUE" }, "geometry": { "type": "Point", "coordinates": [ -123.948516, -81.873970 ] } }
|
||||
{ "type": "Feature", "properties": { "thesum": 100, "themax": 100, "themin": 100, "theproduct": 100, "themean": 100, "theconcat": 100, "thecomma": "NEWVALUE" }, "geometry": { "type": "Point", "coordinates": [ -123.948510, -81.873970 ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -6045,7 +6045,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 14, "x": 8490, "y": 10477 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "thesum": 18, "themax": 18, "themin": 18, "theproduct": 18, "themean": 18, "theconcat": 18, "thecomma": "NEWVALUE" }, "geometry": { "type": "Point", "coordinates": [ 6.564433, -44.802834 ] } }
|
||||
{ "type": "Feature", "properties": { "thesum": 18, "themax": 18, "themin": 18, "theproduct": 18, "themean": 18, "theconcat": 18, "thecomma": "NEWVALUE" }, "geometry": { "type": "Point", "coordinates": [ 6.564433, -44.802838 ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
|
||||
+1
@@ -10,6 +10,7 @@
|
||||
"minzoom": "0",
|
||||
"name": "tests/accumulate/out/-z3_-Ethesum%3asum_-Etheproduct%3aproduct_-Ethemax%3amax_-Ethemin%3amin_-Ethemean%3amean_-Etheconcat%3aconcat_-Ethecomma%3acomma_-r1_-K100.json.check.mbtiles",
|
||||
"strategies": "[{\"coalesced_as_needed\":78},{\"coalesced_as_needed\":65},{\"coalesced_as_needed\":43},{\"coalesced_as_needed\":17}]",
|
||||
"tippecanoe_decisions": "{\"basezoom\":3,\"droprate\":1,\"retain_points_multiplier\":1}",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
+1513
-1514
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+15
-16
File diff suppressed because one or more lines are too long
@@ -1,5 +1,5 @@
|
||||
{ "type": "FeatureCollection", "properties": {
|
||||
"antimeridian_adjusted_bounds": "-175.220565,-41.299988,179.216647,64.150024",
|
||||
"antimeridian_adjusted_bounds": "-175.220564,-41.299988,179.216647,64.150024",
|
||||
"bounds": "-180.000000,-41.299988,180.000000,85.051129",
|
||||
"center": "0.000000,0.000000,0",
|
||||
"description": "tests/csv/out-null.mbtiles",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ "type": "FeatureCollection", "properties": {
|
||||
"antimeridian_adjusted_bounds": "-175.220565,-41.299988,179.216647,64.150024",
|
||||
"antimeridian_adjusted_bounds": "-175.220564,-41.299988,179.216647,64.150024",
|
||||
"bounds": "-180.000000,-41.299988,180.000000,85.051129",
|
||||
"center": "0.000000,0.000000,0",
|
||||
"description": "tests/csv/out.mbtiles",
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
"maxzoom": "2",
|
||||
"minzoom": "0",
|
||||
"name": "tests/curve/out/-z2.json.check.mbtiles",
|
||||
"strategies": "[{},{\"tiny_polygons\":1},{\"tiny_polygons\":4}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
"maxzoom": "2",
|
||||
"minzoom": "0",
|
||||
"name": "tests/curve/out/-z2_--no-clipping.json.check.mbtiles",
|
||||
"strategies": "[{},{\"tiny_polygons\":1},{\"tiny_polygons\":10}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
"maxzoom": "2",
|
||||
"minzoom": "0",
|
||||
"name": "tests/curve/out/-z2_--no-duplication.json.check.mbtiles",
|
||||
"strategies": "[{},{\"tiny_polygons\":6},{\"tiny_polygons\":6}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
"maxzoom": "5",
|
||||
"minzoom": "0",
|
||||
"name": "tests/dateline/out/-z5.json.check.mbtiles",
|
||||
"strategies": "[{},{},{},{\"tiny_polygons\":1},{},{\"tiny_polygons\":1}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
"maxzoom": "5",
|
||||
"minzoom": "0",
|
||||
"name": "tests/dateline/out/-z5_-b0.json.check.mbtiles",
|
||||
"strategies": "[{},{},{},{\"tiny_polygons\":1},{},{}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ "type": "FeatureCollection", "properties": {
|
||||
"antimeridian_adjusted_bounds": "-175.220565,-41.299974,179.216647,64.150024",
|
||||
"bounds": "-175.220565,-41.299974,179.216647,64.150024",
|
||||
"antimeridian_adjusted_bounds": "-175.220564,-41.299974,179.216647,64.150024",
|
||||
"bounds": "-175.220564,-41.299974,179.216647,64.150024",
|
||||
"center": "16.875000,44.951199,5",
|
||||
"description": "tests/epsg-3857/out/-yNAME_-z5_-sEPSG%3a3857.json.check.mbtiles",
|
||||
"format": "pbf",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+22
-22
@@ -20,12 +20,12 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241526, 37.807275 ], [ -122.241354, 37.807038 ], [ -122.240968, 37.806868 ], [ -122.240410, 37.806800 ], [ -122.239938, 37.806800 ], [ -122.239509, 37.806732 ], [ -122.238436, 37.806088 ], [ -122.237277, 37.805647 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294569, 37.833005 ], [ -122.294312, 37.832497 ], [ -122.294054, 37.831853 ], [ -122.293839, 37.830395 ], [ -122.293882, 37.829413 ], [ -122.293797, 37.829006 ], [ -122.293582, 37.828565 ], [ -122.293239, 37.828158 ], [ -122.292724, 37.827785 ], [ -122.290320, 37.826565 ], [ -122.289548, 37.826396 ], [ -122.288218, 37.826328 ], [ -122.287488, 37.826430 ], [ -122.282896, 37.827277 ], [ -122.281737, 37.827277 ], [ -122.281222, 37.827209 ], [ -122.278519, 37.826599 ], [ -122.275128, 37.825752 ], [ -122.270408, 37.824701 ], [ -122.268434, 37.824158 ], [ -122.265944, 37.823582 ], [ -122.262340, 37.822870 ], [ -122.260151, 37.822192 ], [ -122.259078, 37.821819 ], [ -122.255902, 37.820226 ], [ -122.254272, 37.819175 ], [ -122.253027, 37.818192 ], [ -122.252297, 37.817277 ], [ -122.251697, 37.816158 ], [ -122.251310, 37.815073 ], [ -122.250581, 37.812327 ], [ -122.250366, 37.811818 ], [ -122.250152, 37.811479 ], [ -122.249594, 37.810903 ], [ -122.249207, 37.810598 ], [ -122.248693, 37.810326 ], [ -122.245946, 37.809445 ], [ -122.243543, 37.808801 ], [ -122.241311, 37.808055 ], [ -122.235990, 37.805681 ], [ -122.234831, 37.805037 ], [ -122.233543, 37.804223 ], [ -122.230625, 37.801918 ], [ -122.229981, 37.801477 ], [ -122.229123, 37.801036 ], [ -122.228479, 37.800765 ], [ -122.227707, 37.800561 ], [ -122.220583, 37.799069 ], [ -122.216463, 37.798086 ], [ -122.215776, 37.797848 ], [ -122.212172, 37.796967 ], [ -122.211142, 37.796628 ], [ -122.210069, 37.796187 ], [ -122.206507, 37.794491 ], [ -122.205219, 37.793745 ], [ -122.204490, 37.793168 ], [ -122.203932, 37.792626 ], [ -122.201357, 37.789845 ], [ -122.200627, 37.789167 ], [ -122.200241, 37.788929 ], [ -122.199082, 37.788217 ], [ -122.193761, 37.785639 ], [ -122.192516, 37.785165 ], [ -122.191272, 37.784792 ], [ -122.189727, 37.784418 ], [ -122.188611, 37.784249 ], [ -122.184706, 37.784011 ], [ -122.179556, 37.783842 ], [ -122.178741, 37.783706 ], [ -122.178268, 37.783571 ], [ -122.173676, 37.780959 ], [ -122.169385, 37.778686 ], [ -122.167969, 37.778008 ], [ -122.164536, 37.776448 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690483032", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.184062, 37.776583 ], [ -122.180629, 37.774616 ], [ -122.179685, 37.773937 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 0, "properties": { "LINEARID": "1102406970092", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.181144, 37.774887 ], [ -122.180157, 37.774243 ], [ -122.177968, 37.772547 ], [ -122.176938, 37.771529 ], [ -122.176595, 37.771258 ], [ -122.173247, 37.769663 ], [ -122.173119, 37.769663 ], [ -122.172003, 37.769154 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294569, 37.833005 ], [ -122.294312, 37.832497 ], [ -122.294054, 37.831853 ], [ -122.293839, 37.830395 ], [ -122.293882, 37.829413 ], [ -122.293797, 37.829006 ], [ -122.293582, 37.828565 ], [ -122.293239, 37.828158 ], [ -122.292724, 37.827785 ], [ -122.290320, 37.826565 ], [ -122.289548, 37.826396 ], [ -122.288218, 37.826328 ], [ -122.287488, 37.826430 ], [ -122.282896, 37.827277 ], [ -122.281737, 37.827277 ], [ -122.281222, 37.827209 ], [ -122.278519, 37.826599 ], [ -122.275128, 37.825752 ], [ -122.270408, 37.824701 ], [ -122.268434, 37.824158 ], [ -122.265944, 37.823582 ], [ -122.262340, 37.822870 ], [ -122.260151, 37.822192 ], [ -122.259078, 37.821819 ], [ -122.255902, 37.820226 ], [ -122.254272, 37.819175 ], [ -122.253027, 37.818192 ], [ -122.252297, 37.817277 ], [ -122.251697, 37.816158 ], [ -122.251310, 37.815073 ], [ -122.250581, 37.812327 ], [ -122.250366, 37.811818 ], [ -122.250152, 37.811479 ], [ -122.249594, 37.810903 ], [ -122.249207, 37.810598 ], [ -122.248693, 37.810326 ], [ -122.245946, 37.809445 ], [ -122.243543, 37.808801 ], [ -122.241311, 37.808055 ], [ -122.235990, 37.805681 ], [ -122.234831, 37.805037 ], [ -122.233543, 37.804223 ], [ -122.230625, 37.801918 ], [ -122.229981, 37.801477 ], [ -122.229123, 37.801036 ], [ -122.228479, 37.800765 ], [ -122.227707, 37.800561 ], [ -122.220583, 37.799069 ], [ -122.216463, 37.798086 ], [ -122.215776, 37.797848 ], [ -122.212172, 37.796967 ], [ -122.211142, 37.796628 ], [ -122.210069, 37.796187 ], [ -122.206507, 37.794491 ], [ -122.205219, 37.793745 ], [ -122.204490, 37.793168 ], [ -122.203932, 37.792626 ], [ -122.201357, 37.789845 ], [ -122.200627, 37.789167 ], [ -122.200241, 37.788929 ], [ -122.199082, 37.788217 ], [ -122.193761, 37.785639 ], [ -122.192516, 37.785165 ], [ -122.191272, 37.784792 ], [ -122.189727, 37.784418 ], [ -122.188611, 37.784249 ], [ -122.184706, 37.784011 ], [ -122.179556, 37.783842 ], [ -122.178741, 37.783706 ], [ -122.178268, 37.783571 ], [ -122.173676, 37.780959 ], [ -122.169385, 37.778686 ], [ -122.167969, 37.778008 ], [ -122.164536, 37.776448 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 123, "properties": { "LINEARID": "1102954918511", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.172003, 37.769154 ], [ -122.169685, 37.767628 ], [ -122.167969, 37.766339 ], [ -122.164536, 37.762369 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 1073741824, "properties": { "LINEARID": "1105089465114", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.169771, 37.767560 ], [ -122.168355, 37.766542 ], [ -122.167969, 37.766203 ], [ -122.164536, 37.762233 ] ] } }
|
||||
@@ -56,12 +56,12 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 12, "x": 657, "y": 1583 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.200906, 37.789438 ], [ -122.200606, 37.789184 ], [ -122.199790, 37.788641 ], [ -122.199318, 37.788370 ], [ -122.198761, 37.788081 ], [ -122.194490, 37.785945 ], [ -122.193739, 37.785622 ], [ -122.192109, 37.785029 ], [ -122.191250, 37.784775 ], [ -122.190328, 37.784554 ], [ -122.189727, 37.784435 ], [ -122.188590, 37.784249 ], [ -122.187366, 37.784147 ], [ -122.184684, 37.783994 ], [ -122.179534, 37.783842 ], [ -122.178741, 37.783706 ], [ -122.178247, 37.783571 ], [ -122.173676, 37.780976 ], [ -122.169385, 37.778703 ], [ -122.167969, 37.777991 ], [ -122.166252, 37.777228 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690483032", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.184041, 37.776566 ], [ -122.180607, 37.774633 ], [ -122.180285, 37.774429 ], [ -122.179706, 37.773954 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 0, "properties": { "LINEARID": "1102406970092", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.181165, 37.774870 ], [ -122.180157, 37.774260 ], [ -122.179642, 37.773836 ], [ -122.177947, 37.772564 ], [ -122.176938, 37.771529 ], [ -122.176595, 37.771258 ], [ -122.173226, 37.769663 ], [ -122.173140, 37.769663 ], [ -122.172003, 37.769171 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.200906, 37.789438 ], [ -122.200606, 37.789184 ], [ -122.200499, 37.789133 ], [ -122.199790, 37.788641 ], [ -122.199318, 37.788370 ], [ -122.198761, 37.788081 ], [ -122.194490, 37.785945 ], [ -122.193739, 37.785622 ], [ -122.192109, 37.785029 ], [ -122.191250, 37.784775 ], [ -122.190328, 37.784554 ], [ -122.189727, 37.784435 ], [ -122.188590, 37.784249 ], [ -122.187366, 37.784147 ], [ -122.184684, 37.783994 ], [ -122.179534, 37.783842 ], [ -122.178741, 37.783706 ], [ -122.178247, 37.783571 ], [ -122.173676, 37.780976 ], [ -122.169385, 37.778703 ], [ -122.167969, 37.777991 ], [ -122.166252, 37.777228 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 123, "properties": { "LINEARID": "1102954918511", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.172003, 37.769171 ], [ -122.169707, 37.767611 ], [ -122.168226, 37.766559 ], [ -122.167969, 37.766339 ], [ -122.166252, 37.764371 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 1073741824, "properties": { "LINEARID": "1105089465114", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.169771, 37.767560 ], [ -122.168334, 37.766542 ], [ -122.167969, 37.766203 ], [ -122.166252, 37.764235 ] ] } }
|
||||
@@ -88,7 +88,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 12, "x": 658, "y": 1583 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.169685, 37.778856 ], [ -122.167969, 37.777991 ], [ -122.165673, 37.776990 ], [ -122.163270, 37.775854 ], [ -122.159235, 37.773819 ], [ -122.158098, 37.773157 ], [ -122.157025, 37.772394 ], [ -122.156038, 37.771495 ], [ -122.155201, 37.770596 ], [ -122.154515, 37.769595 ], [ -122.152348, 37.766101 ], [ -122.151875, 37.765456 ], [ -122.150502, 37.763794 ], [ -122.148721, 37.761131 ], [ -122.148292, 37.760317 ], [ -122.148077, 37.759757 ], [ -122.148013, 37.759485 ], [ -122.147927, 37.758552 ], [ -122.147949, 37.758230 ], [ -122.148035, 37.757755 ], [ -122.148271, 37.757178 ], [ -122.148571, 37.756686 ], [ -122.148914, 37.756262 ], [ -122.150481, 37.754820 ], [ -122.150996, 37.754277 ], [ -122.151403, 37.753717 ], [ -122.151575, 37.753429 ], [ -122.151811, 37.752767 ], [ -122.151897, 37.752309 ], [ -122.151940, 37.751766 ], [ -122.151897, 37.751138 ], [ -122.151768, 37.750680 ], [ -122.151618, 37.750239 ], [ -122.149665, 37.746218 ], [ -122.149215, 37.745505 ], [ -122.148829, 37.745013 ], [ -122.148485, 37.744623 ], [ -122.148142, 37.744335 ], [ -122.147820, 37.744080 ], [ -122.146554, 37.743215 ], [ -122.146039, 37.742808 ], [ -122.145588, 37.742333 ], [ -122.143936, 37.740211 ], [ -122.143013, 37.739380 ], [ -122.141404, 37.738073 ], [ -122.141125, 37.737768 ], [ -122.140718, 37.737174 ], [ -122.140460, 37.736699 ], [ -122.140288, 37.736241 ], [ -122.139494, 37.732847 ], [ -122.138443, 37.729045 ], [ -122.138336, 37.728638 ], [ -122.137907, 37.725956 ], [ -122.137671, 37.725057 ], [ -122.137413, 37.724463 ], [ -122.136919, 37.723665 ], [ -122.134645, 37.720678 ], [ -122.134023, 37.719745 ], [ -122.133379, 37.718590 ], [ -122.132714, 37.717232 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.169685, 37.778856 ], [ -122.167969, 37.777991 ], [ -122.165673, 37.776990 ], [ -122.163270, 37.775854 ], [ -122.159235, 37.773819 ], [ -122.158098, 37.773157 ], [ -122.157025, 37.772394 ], [ -122.156038, 37.771495 ], [ -122.155201, 37.770596 ], [ -122.154515, 37.769595 ], [ -122.152348, 37.766101 ], [ -122.151875, 37.765456 ], [ -122.150502, 37.763794 ], [ -122.148721, 37.761131 ], [ -122.148292, 37.760317 ], [ -122.148077, 37.759757 ], [ -122.148013, 37.759485 ], [ -122.147927, 37.758552 ], [ -122.147992, 37.757975 ], [ -122.148035, 37.757755 ], [ -122.148271, 37.757178 ], [ -122.148571, 37.756686 ], [ -122.148914, 37.756262 ], [ -122.150481, 37.754820 ], [ -122.150996, 37.754277 ], [ -122.151403, 37.753717 ], [ -122.151575, 37.753429 ], [ -122.151811, 37.752767 ], [ -122.151897, 37.752309 ], [ -122.151940, 37.751766 ], [ -122.151897, 37.751138 ], [ -122.151768, 37.750680 ], [ -122.151618, 37.750239 ], [ -122.149665, 37.746218 ], [ -122.149215, 37.745505 ], [ -122.148829, 37.745013 ], [ -122.148485, 37.744623 ], [ -122.148142, 37.744335 ], [ -122.147820, 37.744080 ], [ -122.146554, 37.743215 ], [ -122.146039, 37.742808 ], [ -122.145588, 37.742333 ], [ -122.143936, 37.740211 ], [ -122.143013, 37.739380 ], [ -122.141404, 37.738073 ], [ -122.141125, 37.737768 ], [ -122.140718, 37.737174 ], [ -122.140460, 37.736699 ], [ -122.140288, 37.736241 ], [ -122.139494, 37.732847 ], [ -122.138443, 37.729045 ], [ -122.138336, 37.728638 ], [ -122.137907, 37.725956 ], [ -122.137671, 37.725057 ], [ -122.137413, 37.724463 ], [ -122.136919, 37.723665 ], [ -122.134645, 37.720678 ], [ -122.134023, 37.719745 ], [ -122.133379, 37.718590 ], [ -122.132714, 37.717232 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 123, "properties": { "LINEARID": "1102954918511", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.169685, 37.767611 ], [ -122.168226, 37.766559 ], [ -122.167969, 37.766339 ], [ -122.166510, 37.764676 ], [ -122.163227, 37.760859 ], [ -122.163098, 37.760571 ], [ -122.161617, 37.756466 ] ] } }
|
||||
,
|
||||
@@ -116,17 +116,17 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241504, 37.807275 ], [ -122.241408, 37.807156 ], [ -122.241451, 37.807122 ], [ -122.241354, 37.807029 ], [ -122.241139, 37.806927 ], [ -122.240968, 37.806868 ], [ -122.240657, 37.806800 ], [ -122.240410, 37.806783 ], [ -122.239916, 37.806800 ], [ -122.239616, 37.806749 ], [ -122.239519, 37.806715 ], [ -122.239133, 37.806512 ], [ -122.238801, 37.806283 ], [ -122.238457, 37.806080 ], [ -122.237910, 37.805842 ], [ -122.237266, 37.805639 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.256718, 37.820658 ], [ -122.255859, 37.820192 ], [ -122.255334, 37.819879 ], [ -122.254679, 37.819438 ], [ -122.254261, 37.819184 ], [ -122.253660, 37.818726 ], [ -122.253381, 37.818497 ], [ -122.253038, 37.818175 ], [ -122.252458, 37.817489 ], [ -122.252104, 37.816963 ], [ -122.251761, 37.816310 ], [ -122.251503, 37.815641 ], [ -122.251289, 37.814946 ], [ -122.250581, 37.812327 ], [ -122.250409, 37.811920 ], [ -122.250141, 37.811471 ], [ -122.249798, 37.811081 ], [ -122.249476, 37.810801 ], [ -122.249197, 37.810598 ], [ -122.249036, 37.810496 ], [ -122.248703, 37.810335 ], [ -122.248467, 37.810233 ], [ -122.246718, 37.809708 ], [ -122.246557, 37.809665 ], [ -122.245935, 37.809445 ], [ -122.245302, 37.809284 ], [ -122.243553, 37.808784 ], [ -122.242470, 37.808462 ], [ -122.241290, 37.808063 ], [ -122.239627, 37.807351 ], [ -122.238640, 37.806902 ], [ -122.238060, 37.806597 ], [ -122.237438, 37.806351 ], [ -122.236869, 37.806080 ], [ -122.235990, 37.805690 ], [ -122.234842, 37.805054 ], [ -122.234337, 37.804740 ], [ -122.233565, 37.804240 ], [ -122.233222, 37.803986 ], [ -122.231548, 37.802638 ], [ -122.230625, 37.801926 ], [ -122.230368, 37.801731 ], [ -122.229992, 37.801477 ], [ -122.229681, 37.801299 ], [ -122.229134, 37.801027 ], [ -122.228490, 37.800773 ], [ -122.228115, 37.800663 ], [ -122.227718, 37.800570 ], [ -122.226977, 37.800426 ], [ -122.224263, 37.799824 ], [ -122.220583, 37.799061 ], [ -122.217128, 37.798230 ], [ -122.216485, 37.798094 ], [ -122.215755, 37.797831 ], [ -122.213695, 37.797374 ], [ -122.211914, 37.796907 ], [ -122.211056, 37.796611 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.256718, 37.820658 ], [ -122.255859, 37.820192 ], [ -122.255334, 37.819879 ], [ -122.254679, 37.819438 ], [ -122.254261, 37.819184 ], [ -122.253660, 37.818726 ], [ -122.253381, 37.818497 ], [ -122.253038, 37.818175 ], [ -122.252458, 37.817489 ], [ -122.252104, 37.816963 ], [ -122.251761, 37.816310 ], [ -122.251503, 37.815641 ], [ -122.251289, 37.814946 ], [ -122.250581, 37.812327 ], [ -122.250409, 37.811920 ], [ -122.250141, 37.811471 ], [ -122.249798, 37.811081 ], [ -122.249476, 37.810793 ], [ -122.249036, 37.810496 ], [ -122.248703, 37.810335 ], [ -122.248467, 37.810233 ], [ -122.246718, 37.809708 ], [ -122.246557, 37.809665 ], [ -122.245935, 37.809445 ], [ -122.245302, 37.809284 ], [ -122.243553, 37.808784 ], [ -122.242470, 37.808462 ], [ -122.241290, 37.808063 ], [ -122.239627, 37.807351 ], [ -122.238640, 37.806902 ], [ -122.238060, 37.806597 ], [ -122.237438, 37.806351 ], [ -122.236869, 37.806080 ], [ -122.235990, 37.805690 ], [ -122.234842, 37.805054 ], [ -122.234337, 37.804740 ], [ -122.233565, 37.804240 ], [ -122.233222, 37.803986 ], [ -122.231548, 37.802638 ], [ -122.230625, 37.801926 ], [ -122.230368, 37.801731 ], [ -122.229992, 37.801477 ], [ -122.229681, 37.801299 ], [ -122.229134, 37.801027 ], [ -122.228490, 37.800773 ], [ -122.228115, 37.800663 ], [ -122.227718, 37.800570 ], [ -122.226977, 37.800426 ], [ -122.224263, 37.799824 ], [ -122.220583, 37.799061 ], [ -122.217128, 37.798230 ], [ -122.216485, 37.798094 ], [ -122.215755, 37.797831 ], [ -122.213695, 37.797374 ], [ -122.211914, 37.796907 ], [ -122.211056, 37.796611 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 13, "x": 1315, "y": 3166 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.199984, 37.788760 ], [ -122.199329, 37.788361 ], [ -122.198771, 37.788081 ], [ -122.194480, 37.785953 ], [ -122.193750, 37.785631 ], [ -122.192506, 37.785165 ], [ -122.192109, 37.785029 ], [ -122.191250, 37.784783 ], [ -122.190328, 37.784554 ], [ -122.189738, 37.784427 ], [ -122.188590, 37.784249 ], [ -122.187366, 37.784147 ], [ -122.184695, 37.784003 ], [ -122.179545, 37.783842 ], [ -122.179030, 37.783774 ], [ -122.178751, 37.783715 ], [ -122.178247, 37.783571 ], [ -122.173687, 37.780967 ], [ -122.169396, 37.778695 ], [ -122.167969, 37.777999 ], [ -122.167690, 37.777855 ], [ -122.167110, 37.777601 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690483032", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.184041, 37.776575 ], [ -122.180607, 37.774624 ], [ -122.180296, 37.774429 ], [ -122.179695, 37.773954 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 0, "properties": { "LINEARID": "1102406970092", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.181165, 37.774879 ], [ -122.180167, 37.774251 ], [ -122.179652, 37.773836 ], [ -122.179341, 37.773615 ], [ -122.178515, 37.772971 ], [ -122.177957, 37.772564 ], [ -122.177346, 37.771919 ], [ -122.176949, 37.771529 ], [ -122.176788, 37.771393 ], [ -122.176595, 37.771258 ], [ -122.176434, 37.771173 ], [ -122.175457, 37.770723 ], [ -122.173237, 37.769655 ], [ -122.173129, 37.769663 ], [ -122.171992, 37.769171 ] ] } }
|
||||
{ "type": "Feature", "id": 0, "properties": { "LINEARID": "1102406970092", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.181165, 37.774879 ], [ -122.180167, 37.774251 ], [ -122.179652, 37.773836 ], [ -122.179341, 37.773607 ], [ -122.178515, 37.772971 ], [ -122.177957, 37.772564 ], [ -122.177346, 37.771919 ], [ -122.176949, 37.771529 ], [ -122.176788, 37.771393 ], [ -122.176595, 37.771258 ], [ -122.176434, 37.771173 ], [ -122.175457, 37.770723 ], [ -122.173237, 37.769655 ], [ -122.173129, 37.769663 ], [ -122.171992, 37.769171 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.199984, 37.788760 ], [ -122.199329, 37.788361 ], [ -122.198771, 37.788081 ], [ -122.194480, 37.785953 ], [ -122.193750, 37.785631 ], [ -122.192506, 37.785165 ], [ -122.192109, 37.785029 ], [ -122.191250, 37.784783 ], [ -122.190328, 37.784554 ], [ -122.189738, 37.784427 ], [ -122.188590, 37.784249 ], [ -122.187366, 37.784147 ], [ -122.184695, 37.784003 ], [ -122.179545, 37.783842 ], [ -122.179030, 37.783774 ], [ -122.178751, 37.783715 ], [ -122.178247, 37.783571 ], [ -122.173687, 37.780967 ], [ -122.169396, 37.778695 ], [ -122.167969, 37.777999 ], [ -122.167690, 37.777855 ], [ -122.167110, 37.777601 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 123, "properties": { "LINEARID": "1102954918511", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.171992, 37.769171 ], [ -122.169932, 37.767755 ], [ -122.169696, 37.767611 ], [ -122.168226, 37.766568 ], [ -122.167969, 37.766339 ], [ -122.167690, 37.766042 ], [ -122.167110, 37.765355 ] ] } }
|
||||
,
|
||||
@@ -148,7 +148,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 13, "x": 1316, "y": 3167 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.151200, 37.754023 ], [ -122.151414, 37.753726 ], [ -122.151607, 37.753344 ], [ -122.151715, 37.753073 ], [ -122.151811, 37.752767 ], [ -122.151886, 37.752445 ], [ -122.151929, 37.752038 ], [ -122.151940, 37.751758 ], [ -122.151908, 37.751249 ], [ -122.151854, 37.750969 ], [ -122.151779, 37.750680 ], [ -122.151618, 37.750248 ], [ -122.151425, 37.749815 ], [ -122.151114, 37.749221 ], [ -122.150770, 37.748466 ], [ -122.149676, 37.746218 ], [ -122.149526, 37.745947 ], [ -122.149225, 37.745505 ], [ -122.148904, 37.745098 ], [ -122.148474, 37.744623 ], [ -122.148142, 37.744335 ], [ -122.147820, 37.744080 ], [ -122.146554, 37.743215 ], [ -122.146136, 37.742876 ], [ -122.145717, 37.742477 ], [ -122.145588, 37.742341 ], [ -122.145106, 37.741679 ], [ -122.144043, 37.740305 ], [ -122.143593, 37.739881 ], [ -122.143024, 37.739388 ], [ -122.142359, 37.738862 ], [ -122.141404, 37.738073 ], [ -122.141190, 37.737836 ], [ -122.141061, 37.737666 ], [ -122.140771, 37.737276 ], [ -122.140610, 37.737004 ], [ -122.140460, 37.736699 ], [ -122.140288, 37.736232 ], [ -122.139881, 37.734433 ], [ -122.139494, 37.732855 ], [ -122.139162, 37.731591 ], [ -122.138432, 37.729045 ], [ -122.138336, 37.728638 ], [ -122.137917, 37.725965 ], [ -122.137756, 37.725345 ], [ -122.137660, 37.725048 ], [ -122.137402, 37.724463 ], [ -122.137241, 37.724166 ], [ -122.136919, 37.723665 ], [ -122.136523, 37.723122 ], [ -122.135310, 37.721569 ], [ -122.134645, 37.720678 ], [ -122.134033, 37.719745 ], [ -122.133368, 37.718590 ], [ -122.133025, 37.717911 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.151200, 37.754023 ], [ -122.151414, 37.753726 ], [ -122.151607, 37.753344 ], [ -122.151715, 37.753073 ], [ -122.151811, 37.752767 ], [ -122.151886, 37.752445 ], [ -122.151929, 37.752038 ], [ -122.151940, 37.751758 ], [ -122.151908, 37.751249 ], [ -122.151854, 37.750969 ], [ -122.151779, 37.750680 ], [ -122.151618, 37.750248 ], [ -122.151425, 37.749815 ], [ -122.151114, 37.749221 ], [ -122.150770, 37.748466 ], [ -122.149676, 37.746218 ], [ -122.149526, 37.745947 ], [ -122.149225, 37.745505 ], [ -122.148904, 37.745098 ], [ -122.148474, 37.744623 ], [ -122.148142, 37.744335 ], [ -122.147820, 37.744080 ], [ -122.146554, 37.743215 ], [ -122.146136, 37.742876 ], [ -122.145717, 37.742477 ], [ -122.145588, 37.742341 ], [ -122.145106, 37.741679 ], [ -122.144043, 37.740305 ], [ -122.143593, 37.739881 ], [ -122.143024, 37.739388 ], [ -122.142359, 37.738862 ], [ -122.141404, 37.738073 ], [ -122.141190, 37.737836 ], [ -122.141061, 37.737666 ], [ -122.140771, 37.737276 ], [ -122.140610, 37.737004 ], [ -122.140460, 37.736699 ], [ -122.140288, 37.736232 ], [ -122.139494, 37.732855 ], [ -122.139162, 37.731591 ], [ -122.138432, 37.729045 ], [ -122.138336, 37.728638 ], [ -122.137917, 37.725965 ], [ -122.137756, 37.725345 ], [ -122.137660, 37.725048 ], [ -122.137402, 37.724463 ], [ -122.137241, 37.724166 ], [ -122.136919, 37.723665 ], [ -122.136523, 37.723122 ], [ -122.135310, 37.721569 ], [ -122.134645, 37.720678 ], [ -122.134033, 37.719745 ], [ -122.133368, 37.718590 ], [ -122.133025, 37.717911 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 1073741824, "properties": { "LINEARID": "1105089465114", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.160802, 37.754023 ], [ -122.160555, 37.753344 ], [ -122.159826, 37.751334 ], [ -122.157229, 37.747372 ], [ -122.156500, 37.746227 ], [ -122.156328, 37.746015 ], [ -122.156167, 37.745896 ], [ -122.154826, 37.744988 ], [ -122.154043, 37.744428 ], [ -122.153828, 37.744250 ], [ -122.153431, 37.743885 ], [ -122.152541, 37.742960 ], [ -122.152240, 37.742723 ], [ -122.151725, 37.742341 ], [ -122.151264, 37.742061 ], [ -122.150888, 37.741866 ], [ -122.149075, 37.741017 ], [ -122.148582, 37.740797 ], [ -122.147831, 37.740424 ], [ -122.146286, 37.739694 ] ] } }
|
||||
] }
|
||||
@@ -156,7 +156,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 13, "x": 1316, "y": 3166 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.168827, 37.778423 ], [ -122.167969, 37.777999 ], [ -122.167690, 37.777855 ], [ -122.165684, 37.776990 ], [ -122.163280, 37.775862 ], [ -122.160416, 37.774387 ], [ -122.159246, 37.773819 ], [ -122.158506, 37.773412 ], [ -122.158098, 37.773166 ], [ -122.157530, 37.772776 ], [ -122.157025, 37.772394 ], [ -122.156435, 37.771868 ], [ -122.156028, 37.771495 ], [ -122.155201, 37.770588 ], [ -122.154858, 37.770113 ], [ -122.154504, 37.769595 ], [ -122.152348, 37.766093 ], [ -122.151875, 37.765465 ], [ -122.150813, 37.764201 ], [ -122.150502, 37.763803 ], [ -122.149183, 37.761852 ], [ -122.148721, 37.761122 ], [ -122.148292, 37.760317 ], [ -122.148067, 37.759757 ], [ -122.147970, 37.759307 ], [ -122.147917, 37.758722 ], [ -122.147949, 37.758221 ], [ -122.148035, 37.757763 ], [ -122.148271, 37.757170 ], [ -122.148453, 37.756856 ], [ -122.148710, 37.756508 ], [ -122.148904, 37.756262 ], [ -122.149129, 37.756033 ], [ -122.150481, 37.754812 ], [ -122.151006, 37.754277 ], [ -122.151414, 37.753717 ], [ -122.151607, 37.753344 ], [ -122.151715, 37.753073 ], [ -122.151843, 37.752665 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.168827, 37.778423 ], [ -122.167969, 37.777999 ], [ -122.167690, 37.777855 ], [ -122.165684, 37.776990 ], [ -122.163280, 37.775862 ], [ -122.160416, 37.774387 ], [ -122.159246, 37.773819 ], [ -122.158506, 37.773412 ], [ -122.158098, 37.773166 ], [ -122.157530, 37.772776 ], [ -122.157025, 37.772394 ], [ -122.156435, 37.771868 ], [ -122.156028, 37.771495 ], [ -122.155201, 37.770588 ], [ -122.154858, 37.770113 ], [ -122.154504, 37.769595 ], [ -122.152348, 37.766093 ], [ -122.151875, 37.765465 ], [ -122.150813, 37.764201 ], [ -122.150502, 37.763803 ], [ -122.149183, 37.761852 ], [ -122.148721, 37.761122 ], [ -122.148292, 37.760317 ], [ -122.148067, 37.759757 ], [ -122.147970, 37.759307 ], [ -122.147917, 37.758722 ], [ -122.147949, 37.758221 ], [ -122.147981, 37.757967 ], [ -122.148035, 37.757763 ], [ -122.148271, 37.757170 ], [ -122.148453, 37.756856 ], [ -122.148582, 37.756678 ], [ -122.148904, 37.756262 ], [ -122.149408, 37.755779 ], [ -122.150481, 37.754812 ], [ -122.151006, 37.754277 ], [ -122.151414, 37.753717 ], [ -122.151607, 37.753344 ], [ -122.151715, 37.753073 ], [ -122.151843, 37.752665 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 123, "properties": { "LINEARID": "1102954918511", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.168827, 37.766992 ], [ -122.168226, 37.766568 ], [ -122.167969, 37.766339 ], [ -122.167690, 37.766042 ], [ -122.167164, 37.765423 ], [ -122.166499, 37.764685 ], [ -122.165941, 37.763998 ], [ -122.165684, 37.763718 ], [ -122.164814, 37.762683 ], [ -122.163355, 37.761029 ], [ -122.163237, 37.760859 ], [ -122.163098, 37.760571 ], [ -122.161628, 37.756474 ] ] } }
|
||||
,
|
||||
@@ -172,7 +172,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 14, "x": 2626, "y": 6329 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294564, 37.833010 ], [ -122.294295, 37.832505 ], [ -122.294134, 37.832090 ], [ -122.294065, 37.831849 ], [ -122.293888, 37.830900 ], [ -122.293845, 37.830637 ], [ -122.293823, 37.830395 ], [ -122.293872, 37.829400 ], [ -122.293797, 37.829006 ], [ -122.293721, 37.828815 ], [ -122.293593, 37.828565 ], [ -122.293335, 37.828256 ], [ -122.293233, 37.828154 ], [ -122.292965, 37.827942 ], [ -122.292745, 37.827798 ], [ -122.292493, 37.827658 ], [ -122.291302, 37.827040 ], [ -122.291104, 37.826930 ], [ -122.290546, 37.826663 ], [ -122.290342, 37.826574 ], [ -122.289945, 37.826455 ], [ -122.289543, 37.826383 ], [ -122.289248, 37.826353 ], [ -122.289044, 37.826341 ], [ -122.288598, 37.826328 ], [ -122.288228, 37.826341 ], [ -122.287998, 37.826358 ], [ -122.287719, 37.826391 ], [ -122.287493, 37.826430 ], [ -122.286817, 37.826561 ], [ -122.285594, 37.826777 ], [ -122.284473, 37.826985 ], [ -122.283170, 37.827235 ], [ -122.282907, 37.827269 ], [ -122.282698, 37.827281 ], [ -122.282327, 37.827290 ], [ -122.281753, 37.827281 ], [ -122.281512, 37.827260 ], [ -122.281024, 37.827188 ], [ -122.280804, 37.827146 ], [ -122.278524, 37.826603 ], [ -122.278401, 37.826565 ], [ -122.277832, 37.826421 ], [ -122.277403, 37.826315 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294564, 37.833010 ], [ -122.294295, 37.832505 ], [ -122.294134, 37.832090 ], [ -122.294065, 37.831849 ], [ -122.293888, 37.830900 ], [ -122.293845, 37.830637 ], [ -122.293823, 37.830395 ], [ -122.293872, 37.829400 ], [ -122.293797, 37.829006 ], [ -122.293721, 37.828815 ], [ -122.293593, 37.828565 ], [ -122.293335, 37.828256 ], [ -122.293233, 37.828154 ], [ -122.292965, 37.827942 ], [ -122.292745, 37.827798 ], [ -122.292493, 37.827658 ], [ -122.291302, 37.827040 ], [ -122.291104, 37.826930 ], [ -122.290546, 37.826663 ], [ -122.290342, 37.826574 ], [ -122.289945, 37.826455 ], [ -122.289543, 37.826383 ], [ -122.289248, 37.826353 ], [ -122.289044, 37.826341 ], [ -122.288598, 37.826328 ], [ -122.288228, 37.826341 ], [ -122.287998, 37.826358 ], [ -122.287719, 37.826391 ], [ -122.287493, 37.826430 ], [ -122.286817, 37.826561 ], [ -122.285594, 37.826777 ], [ -122.284473, 37.826985 ], [ -122.283170, 37.827235 ], [ -122.282907, 37.827269 ], [ -122.282698, 37.827281 ], [ -122.282327, 37.827290 ], [ -122.281753, 37.827281 ], [ -122.281512, 37.827260 ], [ -122.281024, 37.827188 ], [ -122.280804, 37.827146 ], [ -122.279919, 37.826938 ], [ -122.279854, 37.826917 ], [ -122.278524, 37.826603 ], [ -122.278395, 37.826565 ], [ -122.277832, 37.826425 ], [ -122.277403, 37.826315 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -184,7 +184,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 14, "x": 2627, "y": 6329 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.278261, 37.826531 ], [ -122.277832, 37.826421 ], [ -122.275144, 37.825747 ], [ -122.275059, 37.825735 ], [ -122.274125, 37.825544 ], [ -122.270408, 37.824705 ], [ -122.269732, 37.824506 ], [ -122.268965, 37.824315 ], [ -122.268450, 37.824175 ], [ -122.267350, 37.823959 ], [ -122.265928, 37.823599 ], [ -122.264856, 37.823391 ], [ -122.264577, 37.823328 ], [ -122.263525, 37.823133 ], [ -122.262323, 37.822874 ], [ -122.262039, 37.822802 ], [ -122.261921, 37.822773 ], [ -122.261079, 37.822463 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.278261, 37.826531 ], [ -122.277832, 37.826425 ], [ -122.275144, 37.825747 ], [ -122.275059, 37.825735 ], [ -122.274125, 37.825544 ], [ -122.270408, 37.824705 ], [ -122.269732, 37.824506 ], [ -122.268965, 37.824315 ], [ -122.268450, 37.824175 ], [ -122.267350, 37.823959 ], [ -122.265928, 37.823599 ], [ -122.264856, 37.823391 ], [ -122.264577, 37.823328 ], [ -122.263525, 37.823133 ], [ -122.262323, 37.822874 ], [ -122.262039, 37.822802 ], [ -122.261921, 37.822773 ], [ -122.261079, 37.822463 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -192,7 +192,7 @@
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.237712, 37.805783 ], [ -122.237272, 37.805643 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.236199, 37.805783 ], [ -122.235990, 37.805690 ], [ -122.235539, 37.805444 ], [ -122.234847, 37.805054 ], [ -122.234337, 37.804745 ], [ -122.233887, 37.804452 ], [ -122.233565, 37.804240 ], [ -122.233458, 37.804160 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.236199, 37.805783 ], [ -122.235990, 37.805690 ], [ -122.235534, 37.805444 ], [ -122.234847, 37.805054 ], [ -122.234337, 37.804745 ], [ -122.233887, 37.804452 ], [ -122.233565, 37.804240 ], [ -122.233458, 37.804160 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -204,7 +204,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241510, 37.807275 ], [ -122.241472, 37.807241 ], [ -122.241408, 37.807160 ], [ -122.241456, 37.807127 ], [ -122.241354, 37.807033 ], [ -122.241145, 37.806927 ], [ -122.240973, 37.806868 ], [ -122.240657, 37.806804 ], [ -122.240410, 37.806788 ], [ -122.240163, 37.806800 ], [ -122.239922, 37.806800 ], [ -122.239793, 37.806783 ], [ -122.239621, 37.806749 ], [ -122.239525, 37.806720 ], [ -122.239412, 37.806669 ], [ -122.239138, 37.806512 ], [ -122.238806, 37.806283 ], [ -122.238597, 37.806156 ], [ -122.238457, 37.806084 ], [ -122.238189, 37.805961 ], [ -122.237910, 37.805847 ], [ -122.237272, 37.805643 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.256289, 37.820429 ], [ -122.255859, 37.820196 ], [ -122.255334, 37.819879 ], [ -122.254685, 37.819442 ], [ -122.254261, 37.819184 ], [ -122.253660, 37.818726 ], [ -122.253381, 37.818497 ], [ -122.253043, 37.818179 ], [ -122.252796, 37.817900 ], [ -122.252458, 37.817489 ], [ -122.252110, 37.816963 ], [ -122.251766, 37.816315 ], [ -122.251691, 37.816145 ], [ -122.251503, 37.815645 ], [ -122.251289, 37.814950 ], [ -122.250586, 37.812331 ], [ -122.250495, 37.812098 ], [ -122.250414, 37.811924 ], [ -122.250291, 37.811704 ], [ -122.250141, 37.811475 ], [ -122.249975, 37.811276 ], [ -122.249798, 37.811085 ], [ -122.249610, 37.810907 ], [ -122.249197, 37.810598 ], [ -122.249036, 37.810500 ], [ -122.248709, 37.810335 ], [ -122.248473, 37.810233 ], [ -122.246724, 37.809708 ], [ -122.246557, 37.809670 ], [ -122.245935, 37.809445 ], [ -122.245302, 37.809288 ], [ -122.243559, 37.808788 ], [ -122.242475, 37.808462 ], [ -122.241853, 37.808262 ], [ -122.241295, 37.808067 ], [ -122.240496, 37.807733 ], [ -122.239627, 37.807355 ], [ -122.238645, 37.806906 ], [ -122.238060, 37.806601 ], [ -122.237438, 37.806351 ], [ -122.236869, 37.806080 ], [ -122.235990, 37.805690 ], [ -122.235539, 37.805444 ], [ -122.234938, 37.805105 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.256289, 37.820429 ], [ -122.255859, 37.820196 ], [ -122.255334, 37.819879 ], [ -122.254685, 37.819442 ], [ -122.254261, 37.819184 ], [ -122.253660, 37.818726 ], [ -122.253381, 37.818497 ], [ -122.253043, 37.818179 ], [ -122.252796, 37.817900 ], [ -122.252458, 37.817489 ], [ -122.252110, 37.816963 ], [ -122.251766, 37.816315 ], [ -122.251691, 37.816145 ], [ -122.251503, 37.815645 ], [ -122.251289, 37.814950 ], [ -122.250586, 37.812331 ], [ -122.250495, 37.812098 ], [ -122.250366, 37.811831 ], [ -122.250141, 37.811475 ], [ -122.249975, 37.811276 ], [ -122.249798, 37.811085 ], [ -122.249610, 37.810907 ], [ -122.249476, 37.810797 ], [ -122.249197, 37.810598 ], [ -122.249036, 37.810500 ], [ -122.248709, 37.810335 ], [ -122.248473, 37.810233 ], [ -122.246724, 37.809708 ], [ -122.246557, 37.809670 ], [ -122.245935, 37.809445 ], [ -122.245302, 37.809288 ], [ -122.243559, 37.808788 ], [ -122.242475, 37.808462 ], [ -122.241853, 37.808262 ], [ -122.241295, 37.808067 ], [ -122.240496, 37.807733 ], [ -122.239627, 37.807355 ], [ -122.238645, 37.806906 ], [ -122.238060, 37.806601 ], [ -122.237438, 37.806351 ], [ -122.236869, 37.806080 ], [ -122.235990, 37.805690 ], [ -122.235534, 37.805444 ], [ -122.234938, 37.805105 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -222,7 +222,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 14, "x": 2630, "y": 6331 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.212343, 37.797022 ], [ -122.212155, 37.796975 ], [ -122.211914, 37.796903 ], [ -122.211667, 37.796827 ], [ -122.211142, 37.796644 ], [ -122.210771, 37.796505 ], [ -122.210058, 37.796191 ], [ -122.208953, 37.795653 ], [ -122.206512, 37.794504 ], [ -122.205884, 37.794177 ], [ -122.205203, 37.793745 ], [ -122.204913, 37.793520 ], [ -122.204474, 37.793160 ], [ -122.203916, 37.792617 ], [ -122.203492, 37.792155 ], [ -122.203406, 37.792079 ], [ -122.201529, 37.790036 ], [ -122.201352, 37.789853 ], [ -122.200665, 37.789226 ], [ -122.200617, 37.789184 ], [ -122.200515, 37.789137 ], [ -122.200241, 37.788929 ], [ -122.199538, 37.788480 ], [ -122.199329, 37.788361 ], [ -122.199077, 37.788230 ], [ -122.198771, 37.788081 ], [ -122.198079, 37.787742 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.212343, 37.797022 ], [ -122.212155, 37.796975 ], [ -122.211914, 37.796903 ], [ -122.211667, 37.796827 ], [ -122.211142, 37.796644 ], [ -122.210771, 37.796505 ], [ -122.210058, 37.796191 ], [ -122.208953, 37.795653 ], [ -122.206512, 37.794504 ], [ -122.205884, 37.794177 ], [ -122.205203, 37.793745 ], [ -122.204913, 37.793520 ], [ -122.204474, 37.793160 ], [ -122.203916, 37.792617 ], [ -122.203492, 37.792155 ], [ -122.203406, 37.792079 ], [ -122.201529, 37.790036 ], [ -122.201352, 37.789853 ], [ -122.200665, 37.789226 ], [ -122.200617, 37.789184 ], [ -122.200509, 37.789137 ], [ -122.200241, 37.788929 ], [ -122.199538, 37.788480 ], [ -122.199329, 37.788361 ], [ -122.199077, 37.788230 ], [ -122.198771, 37.788081 ], [ -122.198079, 37.787742 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -238,11 +238,11 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 14, "x": 2631, "y": 6332 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.190371, 37.784563 ], [ -122.189941, 37.784474 ], [ -122.189738, 37.784431 ], [ -122.188954, 37.784304 ], [ -122.188595, 37.784253 ], [ -122.187366, 37.784147 ], [ -122.185607, 37.784045 ], [ -122.184695, 37.784003 ], [ -122.179840, 37.783863 ], [ -122.179545, 37.783846 ], [ -122.179036, 37.783774 ], [ -122.178751, 37.783715 ], [ -122.178252, 37.783575 ], [ -122.173687, 37.780972 ], [ -122.173247, 37.780747 ], [ -122.169396, 37.778699 ], [ -122.168366, 37.778199 ], [ -122.167969, 37.777999 ], [ -122.167695, 37.777859 ], [ -122.167540, 37.777792 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690483032", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.184046, 37.776575 ], [ -122.183917, 37.776507 ], [ -122.183080, 37.776019 ], [ -122.182265, 37.775574 ], [ -122.181310, 37.775019 ], [ -122.181117, 37.774917 ], [ -122.180613, 37.774629 ], [ -122.180296, 37.774429 ], [ -122.180119, 37.774298 ], [ -122.179701, 37.773954 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 0, "properties": { "LINEARID": "1102406970092", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.181165, 37.774879 ], [ -122.180361, 37.774387 ], [ -122.180167, 37.774255 ], [ -122.179652, 37.773836 ], [ -122.179347, 37.773615 ], [ -122.178521, 37.772971 ], [ -122.177957, 37.772564 ], [ -122.177346, 37.771919 ], [ -122.176949, 37.771529 ], [ -122.176809, 37.771410 ], [ -122.176707, 37.771334 ], [ -122.176600, 37.771262 ], [ -122.176439, 37.771173 ], [ -122.175431, 37.770715 ], [ -122.174728, 37.770376 ] ] } }
|
||||
{ "type": "Feature", "id": 0, "properties": { "LINEARID": "1102406970092", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.181165, 37.774879 ], [ -122.180361, 37.774387 ], [ -122.180167, 37.774255 ], [ -122.179652, 37.773836 ], [ -122.179341, 37.773611 ], [ -122.178521, 37.772971 ], [ -122.177957, 37.772564 ], [ -122.177346, 37.771919 ], [ -122.176949, 37.771529 ], [ -122.176707, 37.771334 ], [ -122.176600, 37.771262 ], [ -122.176439, 37.771173 ], [ -122.175431, 37.770715 ], [ -122.174728, 37.770376 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.190371, 37.784563 ], [ -122.189941, 37.784474 ], [ -122.189738, 37.784431 ], [ -122.188954, 37.784304 ], [ -122.188595, 37.784253 ], [ -122.187366, 37.784147 ], [ -122.185607, 37.784045 ], [ -122.184695, 37.784003 ], [ -122.183011, 37.783948 ], [ -122.179840, 37.783863 ], [ -122.179545, 37.783846 ], [ -122.179036, 37.783774 ], [ -122.178751, 37.783715 ], [ -122.178252, 37.783575 ], [ -122.173687, 37.780972 ], [ -122.173247, 37.780747 ], [ -122.169396, 37.778699 ], [ -122.168366, 37.778199 ], [ -122.167969, 37.777999 ], [ -122.167695, 37.777859 ], [ -122.167540, 37.777792 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -256,11 +256,11 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 14, "x": 2632, "y": 6333 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.155641, 37.771054 ], [ -122.155319, 37.770715 ], [ -122.155207, 37.770592 ], [ -122.154858, 37.770117 ], [ -122.154509, 37.769600 ], [ -122.152353, 37.766097 ], [ -122.152187, 37.765868 ], [ -122.151875, 37.765465 ], [ -122.150813, 37.764205 ], [ -122.150502, 37.763803 ], [ -122.149789, 37.762751 ], [ -122.148936, 37.761466 ], [ -122.148727, 37.761127 ], [ -122.148297, 37.760321 ], [ -122.148206, 37.760075 ], [ -122.148072, 37.759757 ], [ -122.148008, 37.759485 ], [ -122.147976, 37.759307 ], [ -122.147922, 37.758722 ], [ -122.147922, 37.758548 ], [ -122.147949, 37.758226 ], [ -122.147992, 37.757971 ], [ -122.148040, 37.757763 ], [ -122.148099, 37.757590 ], [ -122.148190, 37.757361 ], [ -122.148276, 37.757174 ], [ -122.148458, 37.756860 ], [ -122.148710, 37.756508 ], [ -122.148909, 37.756262 ], [ -122.149408, 37.755779 ], [ -122.150154, 37.755117 ], [ -122.150481, 37.754816 ], [ -122.150706, 37.754595 ], [ -122.151006, 37.754277 ], [ -122.151414, 37.753721 ], [ -122.151607, 37.753344 ], [ -122.151741, 37.753005 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.155641, 37.771054 ], [ -122.155319, 37.770715 ], [ -122.155207, 37.770592 ], [ -122.154858, 37.770117 ], [ -122.154509, 37.769600 ], [ -122.152353, 37.766097 ], [ -122.152187, 37.765868 ], [ -122.151875, 37.765465 ], [ -122.150813, 37.764205 ], [ -122.150502, 37.763803 ], [ -122.149789, 37.762751 ], [ -122.148936, 37.761466 ], [ -122.148727, 37.761127 ], [ -122.148297, 37.760321 ], [ -122.148206, 37.760075 ], [ -122.148072, 37.759757 ], [ -122.148008, 37.759485 ], [ -122.147976, 37.759307 ], [ -122.147922, 37.758722 ], [ -122.147922, 37.758548 ], [ -122.147949, 37.758226 ], [ -122.147986, 37.757971 ], [ -122.148040, 37.757763 ], [ -122.148099, 37.757590 ], [ -122.148190, 37.757361 ], [ -122.148276, 37.757174 ], [ -122.148458, 37.756860 ], [ -122.148710, 37.756508 ], [ -122.148909, 37.756262 ], [ -122.149408, 37.755779 ], [ -122.150154, 37.755117 ], [ -122.150481, 37.754816 ], [ -122.150706, 37.754595 ], [ -122.151006, 37.754277 ], [ -122.151414, 37.753721 ], [ -122.151607, 37.753344 ], [ -122.151741, 37.753005 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 123, "properties": { "LINEARID": "1102954918511", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.168398, 37.766686 ], [ -122.168226, 37.766568 ], [ -122.168022, 37.766398 ], [ -122.167969, 37.766343 ], [ -122.167690, 37.766046 ], [ -122.167169, 37.765423 ], [ -122.166504, 37.764685 ], [ -122.165941, 37.764002 ], [ -122.165689, 37.763722 ], [ -122.164814, 37.762683 ], [ -122.164332, 37.762123 ], [ -122.163361, 37.761033 ], [ -122.163237, 37.760864 ], [ -122.163146, 37.760686 ], [ -122.163103, 37.760571 ], [ -122.161628, 37.756474 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "id": 1073741824, "properties": { "LINEARID": "1105089465114", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.168398, 37.766589 ], [ -122.168221, 37.766453 ], [ -122.168103, 37.766347 ], [ -122.167969, 37.766203 ], [ -122.167786, 37.766008 ], [ -122.167341, 37.765486 ], [ -122.166595, 37.764642 ], [ -122.166005, 37.763947 ], [ -122.165748, 37.763680 ], [ -122.164943, 37.762683 ], [ -122.164831, 37.762568 ], [ -122.164401, 37.762098 ], [ -122.163897, 37.761525 ], [ -122.163425, 37.760987 ], [ -122.163339, 37.760855 ], [ -122.163264, 37.760724 ], [ -122.163189, 37.760558 ], [ -122.161977, 37.757225 ], [ -122.161531, 37.755974 ], [ -122.161301, 37.755371 ], [ -122.160560, 37.753344 ], [ -122.160437, 37.753005 ] ] } }
|
||||
{ "type": "Feature", "id": 1073741824, "properties": { "LINEARID": "1105089465114", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.168398, 37.766589 ], [ -122.168221, 37.766453 ], [ -122.168103, 37.766347 ], [ -122.167969, 37.766203 ], [ -122.167786, 37.766008 ], [ -122.167341, 37.765486 ], [ -122.166595, 37.764642 ], [ -122.166005, 37.763947 ], [ -122.165748, 37.763680 ], [ -122.164943, 37.762683 ], [ -122.164401, 37.762098 ], [ -122.163897, 37.761525 ], [ -122.163425, 37.760987 ], [ -122.163339, 37.760855 ], [ -122.163264, 37.760724 ], [ -122.163189, 37.760558 ], [ -122.161977, 37.757225 ], [ -122.161531, 37.755974 ], [ -122.161301, 37.755371 ], [ -122.160560, 37.753344 ], [ -122.160437, 37.753005 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -278,7 +278,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 14, "x": 2633, "y": 6335 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.140315, 37.736309 ], [ -122.140288, 37.736236 ], [ -122.140224, 37.735969 ], [ -122.140095, 37.735430 ], [ -122.139881, 37.734438 ], [ -122.139500, 37.732855 ], [ -122.139167, 37.731595 ], [ -122.138438, 37.729045 ], [ -122.138336, 37.728638 ], [ -122.138169, 37.727620 ], [ -122.137971, 37.726270 ], [ -122.137917, 37.725965 ], [ -122.137869, 37.725744 ], [ -122.137762, 37.725350 ], [ -122.137665, 37.725053 ], [ -122.137579, 37.724836 ], [ -122.137408, 37.724463 ], [ -122.137247, 37.724166 ], [ -122.136925, 37.723665 ], [ -122.136523, 37.723122 ], [ -122.136109, 37.722604 ], [ -122.135841, 37.722248 ], [ -122.135310, 37.721569 ], [ -122.134645, 37.720678 ], [ -122.134033, 37.719745 ], [ -122.133374, 37.718590 ], [ -122.133202, 37.718251 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.140315, 37.736309 ], [ -122.140288, 37.736236 ], [ -122.140224, 37.735969 ], [ -122.140095, 37.735430 ], [ -122.139891, 37.734493 ], [ -122.139500, 37.732855 ], [ -122.139167, 37.731595 ], [ -122.138438, 37.729045 ], [ -122.138336, 37.728638 ], [ -122.138169, 37.727620 ], [ -122.137971, 37.726270 ], [ -122.137917, 37.725965 ], [ -122.137869, 37.725744 ], [ -122.137762, 37.725350 ], [ -122.137665, 37.725053 ], [ -122.137579, 37.724836 ], [ -122.137408, 37.724463 ], [ -122.137247, 37.724166 ], [ -122.136925, 37.723665 ], [ -122.136523, 37.723122 ], [ -122.136109, 37.722604 ], [ -122.135841, 37.722248 ], [ -122.135310, 37.721569 ], [ -122.134645, 37.720678 ], [ -122.134033, 37.719745 ], [ -122.133374, 37.718590 ], [ -122.133202, 37.718251 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
{ "type": "FeatureCollection", "properties": {
|
||||
"antimeridian_adjusted_bounds": "1.000000,2.000000,1.000000,2.000000",
|
||||
"bounds": "1.000000,2.000000,1.000000,2.000000",
|
||||
"center": "1.000000,2.000000,0",
|
||||
"description": "tests/invalid-linestring/out/-z0.json.check.mbtiles",
|
||||
"format": "pbf",
|
||||
"generator_options": "./tippecanoe -q -a@ -f -o tests/invalid-linestring/out/-z0.json.check.mbtiles -z0 tests/invalid-linestring/too-few.json",
|
||||
"json": "{\"vector_layers\":[{\"id\":\"toofew\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"toofew\",\"count\":1,\"geometry\":\"LineString\",\"attributeCount\":0,\"attributes\":[]}]}}",
|
||||
"maxzoom": "0",
|
||||
"minzoom": "0",
|
||||
"name": "tests/invalid-linestring/out/-z0.json.check.mbtiles",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
] }
|
||||
@@ -0,0 +1 @@
|
||||
{ "type": "Feature", "properties": {}, "geometry": { "type": "LineString", "coordinates": [ [ 1, 2 ] ] } }
|
||||
@@ -0,0 +1 @@
|
||||
{ "type": "Feature", "properties": { "handle": 717, "block": -1, "etype": 13, "space": 0, "layer": "0", "olinetype": "BYLAYER", "linetype": "", "color": "0,0,0,255", "ocolor": 7, "color24": -1, "transparency": 0, "lweight": -1, "linewidth": 0.0, "ltscale": 1.0, "visible": 1, "thickness": 0.0, "ext": null, "name": "SOLID", "solid": 1, "associative": 0, "hstyle": 1, "hpattern": 1, "doubleflag": 0, "angle": 0.0, "scale": 0.0, "deflines": 0 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -135.2329619, -85.526118 ], [ -135.2329619, -85.526118 ] ] ] ] } }
|
||||
@@ -0,0 +1,15 @@
|
||||
{ "type": "FeatureCollection", "properties": {
|
||||
"antimeridian_adjusted_bounds": "180.000000,85.051129,-180.000000,-85.051129",
|
||||
"bounds": "-135.232962,-85.051129,-135.232962,-85.051129",
|
||||
"center": "-135.232962,-85.051129,0",
|
||||
"description": "tests/invalid-polygon/out/-z0.json.check.mbtiles",
|
||||
"format": "pbf",
|
||||
"generator_options": "./tippecanoe -q -a@ -f -o tests/invalid-polygon/out/-z0.json.check.mbtiles -z0 tests/invalid-polygon/in.json",
|
||||
"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"angle\":\"Number\",\"associative\":\"Number\",\"block\":\"Number\",\"color\":\"String\",\"color24\":\"Number\",\"deflines\":\"Number\",\"doubleflag\":\"Number\",\"etype\":\"Number\",\"handle\":\"Number\",\"hpattern\":\"Number\",\"hstyle\":\"Number\",\"layer\":\"String\",\"linetype\":\"String\",\"linewidth\":\"Number\",\"ltscale\":\"Number\",\"lweight\":\"Number\",\"name\":\"String\",\"ocolor\":\"Number\",\"olinetype\":\"String\",\"scale\":\"Number\",\"solid\":\"Number\",\"space\":\"Number\",\"thickness\":\"Number\",\"transparency\":\"Number\",\"visible\":\"Number\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":1,\"geometry\":\"Polygon\",\"attributeCount\":25,\"attributes\":[{\"attribute\":\"angle\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":0},{\"attribute\":\"associative\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":0},{\"attribute\":\"block\",\"count\":1,\"type\":\"number\",\"values\":[-1],\"min\":-1,\"max\":-1},{\"attribute\":\"color\",\"count\":1,\"type\":\"string\",\"values\":[\"0,0,0,255\"]},{\"attribute\":\"color24\",\"count\":1,\"type\":\"number\",\"values\":[-1],\"min\":-1,\"max\":-1},{\"attribute\":\"deflines\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":0},{\"attribute\":\"doubleflag\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":0},{\"attribute\":\"etype\",\"count\":1,\"type\":\"number\",\"values\":[13],\"min\":13,\"max\":13},{\"attribute\":\"handle\",\"count\":1,\"type\":\"number\",\"values\":[717],\"min\":717,\"max\":717},{\"attribute\":\"hpattern\",\"count\":1,\"type\":\"number\",\"values\":[1],\"min\":1,\"max\":1},{\"attribute\":\"hstyle\",\"count\":1,\"type\":\"number\",\"values\":[1],\"min\":1,\"max\":1},{\"attribute\":\"layer\",\"count\":1,\"type\":\"string\",\"values\":[\"0\"]},{\"attribute\":\"linetype\",\"count\":1,\"type\":\"string\",\"values\":[\"\"]},{\"attribute\":\"linewidth\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":0},{\"attribute\":\"ltscale\",\"count\":1,\"type\":\"number\",\"values\":[1],\"min\":1,\"max\":1},{\"attribute\":\"lweight\",\"count\":1,\"type\":\"number\",\"values\":[-1],\"min\":-1,\"max\":-1},{\"attribute\":\"name\",\"count\":1,\"type\":\"string\",\"values\":[\"SOLID\"]},{\"attribute\":\"ocolor\",\"count\":1,\"type\":\"number\",\"values\":[7],\"min\":7,\"max\":7},{\"attribute\":\"olinetype\",\"count\":1,\"type\":\"string\",\"values\":[\"BYLAYER\"]},{\"attribute\":\"scale\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":0},{\"attribute\":\"solid\",\"count\":1,\"type\":\"number\",\"values\":[1],\"min\":1,\"max\":1},{\"attribute\":\"space\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":0},{\"attribute\":\"thickness\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":0},{\"attribute\":\"transparency\",\"count\":1,\"type\":\"number\",\"values\":[0],\"min\":0,\"max\":0},{\"attribute\":\"visible\",\"count\":1,\"type\":\"number\",\"values\":[1],\"min\":1,\"max\":1}]}]}}",
|
||||
"maxzoom": "0",
|
||||
"minzoom": "0",
|
||||
"name": "tests/invalid-polygon/out/-z0.json.check.mbtiles",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
] }
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -14,15 +14,15 @@
|
||||
}, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 0, "x": 0, "y": 0 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -45.439453, -3.162456 ], [ -45.351562, -3.162456 ], [ -45.351562, -3.250209 ], [ -45.439453, -3.250209 ], [ -45.439453, -3.162456 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -174.462891, -4.653080 ], [ -174.462891, -4.740675 ], [ -174.550781, -4.653080 ], [ -174.462891, -4.653080 ] ] ], [ [ [ 185.537109, -4.653080 ], [ 185.537109, -4.740675 ], [ 185.449219, -4.653080 ], [ 185.537109, -4.653080 ] ] ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "adm1_code": "FSM-4943", "OBJECTID_1": 6464, "diss_me": 4943, "adm1_cod_1": "FSM-4943", "iso_3166_2": "FM-YAP", "wikipedia": "http://en.wikipedia.org/wiki/Yap_State", "iso_a2": "FM", "adm0_sr": 5, "name": "Yap", "code_hasc": "FM.YA", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 10, "datarank": 10, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 scale rank", "name_len": 3, "mapcolor9": 4, "mapcolor13": 13, "fips": "FM04", "woe_id": 2345343, "woe_label": "Yap, FM, Federated States of Micronesia", "woe_name": "Yap", "latitude": 9.581009, "longitude": 138.114, "sov_a3": "FSM", "adm0_a3": "FSM", "adm0_label": 5, "admin": "Federated States of Micronesia", "geonunit": "Federated States of Micronesia", "gu_a3": "FSM", "gn_id": 2081175, "gn_name": "State of Yap", "gns_id": -3741502, "gns_name": "Yap, State of", "gn_level": 1, "gn_a1_code": "FM.04", "gns_level": 1, "gns_adm1": "FM04" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 142.382812, 8.146243 ], [ 142.470703, 8.146243 ], [ 142.470703, 8.059230 ], [ 142.382812, 8.059230 ], [ 142.382812, 8.146243 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "FSM-4943", "OBJECTID_1": 6464, "diss_me": 4943, "adm1_cod_1": "FSM-4943", "iso_3166_2": "FM-YAP", "wikipedia": "http://en.wikipedia.org/wiki/Yap_State", "iso_a2": "FM", "adm0_sr": 5, "name": "Yap", "code_hasc": "FM.YA", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 10, "datarank": 10, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 scale rank", "name_len": 3, "mapcolor9": 4, "mapcolor13": 13, "fips": "FM04", "woe_id": 2345343, "woe_label": "Yap, FM, Federated States of Micronesia", "woe_name": "Yap", "latitude": 9.581009, "longitude": 138.114, "sov_a3": "FSM", "adm0_a3": "FSM", "adm0_label": 5, "admin": "Federated States of Micronesia", "geonunit": "Federated States of Micronesia", "gu_a3": "FSM", "gn_id": 2081175, "gn_name": "State of Yap", "gns_id": -3741502, "gns_name": "Yap, State of", "gn_level": 1, "gn_a1_code": "FM.04", "gns_level": 1, "gns_adm1": "FM04" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 138.251953, 9.535749 ], [ 138.076172, 9.362353 ], [ 138.164062, 9.535749 ], [ 138.251953, 9.535749 ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 1, "x": 0, "y": 1 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -155.830078, -5.615986 ], [ -155.874023, -5.659719 ], [ -155.917969, -5.615986 ], [ -155.830078, -5.615986 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -165.014648, -5.878332 ], [ -164.970703, -5.878332 ], [ -164.970703, -5.965754 ], [ -165.014648, -5.965754 ], [ -165.014648, -5.878332 ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -34,13 +34,13 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 1, "x": 1, "y": 1 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 173.540039, 0.219726 ], [ 173.583984, 0.219726 ], [ 173.583984, 0.175781 ], [ 173.540039, 0.175781 ], [ 173.540039, 0.219726 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 173.935547, 0.395505 ], [ 173.979492, 0.351560 ], [ 173.935547, 0.307616 ], [ 173.935547, 0.395505 ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 1, "x": 1, "y": 0 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 173.540039, 0.263671 ], [ 173.583984, 0.263671 ], [ 173.583984, 0.219726 ], [ 173.540039, 0.219726 ], [ 173.540039, 0.263671 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 173.935547, 0.395505 ], [ 173.979492, 0.351560 ], [ 173.935547, 0.307616 ], [ 173.935547, 0.395505 ] ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "adm1_code": "FSM-4943", "OBJECTID_1": 6464, "diss_me": 4943, "adm1_cod_1": "FSM-4943", "iso_3166_2": "FM-YAP", "wikipedia": "http://en.wikipedia.org/wiki/Yap_State", "iso_a2": "FM", "adm0_sr": 5, "name": "Yap", "code_hasc": "FM.YA", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 10, "datarank": 10, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 scale rank", "name_len": 3, "mapcolor9": 4, "mapcolor13": 13, "fips": "FM04", "woe_id": 2345343, "woe_label": "Yap, FM, Federated States of Micronesia", "woe_name": "Yap", "latitude": 9.581009, "longitude": 138.114, "sov_a3": "FSM", "adm0_a3": "FSM", "adm0_label": 5, "admin": "Federated States of Micronesia", "geonunit": "Federated States of Micronesia", "gu_a3": "FSM", "gn_id": 2081175, "gn_name": "State of Yap", "gns_id": -3741502, "gns_name": "Yap, State of", "gn_level": 1, "gn_a1_code": "FM.04", "gns_level": 1, "gns_adm1": "FM04" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 138.164062, 9.579084 ], [ 138.251953, 9.535749 ], [ 138.076172, 9.405710 ], [ 138.164062, 9.579084 ] ] ] } }
|
||||
] }
|
||||
@@ -48,27 +48,27 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 2, "x": 0, "y": 2 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -155.852051, -5.615986 ], [ -155.874023, -5.637853 ], [ -155.939941, -5.615986 ], [ -155.852051, -5.615986 ] ] ], [ [ [ -171.254883, -4.434044 ], [ -171.232910, -4.477856 ], [ -171.254883, -4.477856 ], [ -171.254883, -4.434044 ] ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -150.227051, -9.990491 ], [ -150.227051, -10.012130 ], [ -150.249023, -9.990491 ], [ -150.227051, -9.990491 ] ] ], [ [ [ -174.550781, -4.653080 ], [ -174.506836, -4.674980 ], [ -174.506836, -4.696879 ], [ -174.528809, -4.674980 ], [ -174.550781, -4.653080 ] ] ], [ [ [ -171.254883, -4.434044 ], [ -171.232910, -4.455951 ], [ -171.232910, -4.477856 ], [ -171.254883, -4.434044 ] ] ], [ [ [ -171.079102, -3.118576 ], [ -171.079102, -3.140516 ], [ -171.101074, -3.140516 ], [ -171.079102, -3.118576 ] ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 2, "x": 3, "y": 2 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 173.518066, 0.263671 ], [ 173.562012, 0.263671 ], [ 173.562012, 0.219726 ], [ 173.518066, 0.219726 ], [ 173.518066, 0.263671 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 173.408203, 0.219726 ], [ 173.408203, 0.197754 ], [ 173.386230, 0.219726 ], [ 173.408203, 0.219726 ] ] ], [ [ [ 173.364258, 0.263671 ], [ 173.364258, 0.241699 ], [ 173.342285, 0.263671 ], [ 173.364258, 0.263671 ] ] ], [ [ [ 173.935547, 0.395505 ], [ 173.957520, 0.351560 ], [ 173.935547, 0.307616 ], [ 173.935547, 0.395505 ] ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 2, "x": 3, "y": 1 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 173.518066, 0.285643 ], [ 173.562012, 0.285643 ], [ 173.562012, 0.241699 ], [ 173.518066, 0.241699 ], [ 173.518066, 0.285643 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 173.408203, 0.219726 ], [ 173.408203, 0.197754 ], [ 173.386230, 0.219726 ], [ 173.408203, 0.219726 ] ] ], [ [ [ 173.364258, 0.263671 ], [ 173.364258, 0.241699 ], [ 173.342285, 0.263671 ], [ 173.364258, 0.263671 ] ] ], [ [ [ 173.935547, 0.395505 ], [ 173.957520, 0.351560 ], [ 173.935547, 0.307616 ], [ 173.935547, 0.395505 ] ] ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "adm1_code": "FSM-4943", "OBJECTID_1": 6464, "diss_me": 4943, "adm1_cod_1": "FSM-4943", "iso_3166_2": "FM-YAP", "wikipedia": "http://en.wikipedia.org/wiki/Yap_State", "iso_a2": "FM", "adm0_sr": 5, "name": "Yap", "code_hasc": "FM.YA", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 10, "datarank": 10, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 scale rank", "name_len": 3, "mapcolor9": 4, "mapcolor13": 13, "fips": "FM04", "woe_id": 2345343, "woe_label": "Yap, FM, Federated States of Micronesia", "woe_name": "Yap", "latitude": 9.581009, "longitude": 138.114, "sov_a3": "FSM", "adm0_a3": "FSM", "adm0_label": 5, "admin": "Federated States of Micronesia", "geonunit": "Federated States of Micronesia", "gu_a3": "FSM", "gn_id": 2081175, "gn_name": "State of Yap", "gns_id": -3741502, "gns_name": "Yap, State of", "gn_level": 1, "gn_a1_code": "FM.04", "gns_level": 1, "gns_adm1": "FM04" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 138.164062, 9.579084 ], [ 138.186035, 9.535749 ], [ 138.229980, 9.557417 ], [ 138.186035, 9.492408 ], [ 138.164062, 9.535749 ], [ 138.076172, 9.405710 ], [ 138.054199, 9.427387 ], [ 138.142090, 9.579084 ], [ 138.142090, 9.535749 ], [ 138.164062, 9.579084 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "FSM-4943", "OBJECTID_1": 6464, "diss_me": 4943, "adm1_cod_1": "FSM-4943", "iso_3166_2": "FM-YAP", "wikipedia": "http://en.wikipedia.org/wiki/Yap_State", "iso_a2": "FM", "adm0_sr": 5, "name": "Yap", "code_hasc": "FM.YA", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 10, "datarank": 10, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 scale rank", "name_len": 3, "mapcolor9": 4, "mapcolor13": 13, "fips": "FM04", "woe_id": 2345343, "woe_label": "Yap, FM, Federated States of Micronesia", "woe_name": "Yap", "latitude": 9.581009, "longitude": 138.114, "sov_a3": "FSM", "adm0_a3": "FSM", "adm0_label": 5, "admin": "Federated States of Micronesia", "geonunit": "Federated States of Micronesia", "gu_a3": "FSM", "gn_id": 2081175, "gn_name": "State of Yap", "gns_id": -3741502, "gns_name": "Yap, State of", "gn_level": 1, "gn_a1_code": "FM.04", "gns_level": 1, "gns_adm1": "FM04" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 143.920898, 7.384258 ], [ 143.920898, 7.362467 ], [ 143.898926, 7.362467 ], [ 143.920898, 7.384258 ] ] ], [ [ [ 138.164062, 9.579084 ], [ 138.186035, 9.535749 ], [ 138.229980, 9.557417 ], [ 138.186035, 9.492408 ], [ 138.164062, 9.535749 ], [ 138.076172, 9.405710 ], [ 138.054199, 9.427387 ], [ 138.142090, 9.579084 ], [ 138.142090, 9.535749 ], [ 138.164062, 9.579084 ] ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 3, "x": 0, "y": 4 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -150.227051, -9.990491 ], [ -150.227051, -10.012130 ], [ -150.249023, -10.012130 ], [ -150.249023, -9.990491 ], [ -150.227051, -9.990491 ] ] ], [ [ [ -155.852051, -5.615986 ], [ -155.874023, -5.637853 ], [ -155.917969, -5.637853 ], [ -155.939941, -5.615986 ], [ -155.852051, -5.615986 ] ] ], [ [ [ -174.517822, -4.674980 ], [ -174.506836, -4.674980 ], [ -174.506836, -4.696879 ], [ -174.517822, -4.674980 ] ] ], [ [ [ -171.254883, -4.434044 ], [ -171.232910, -4.477856 ], [ -171.254883, -4.477856 ], [ -171.254883, -4.434044 ] ] ], [ [ [ -171.079102, -3.118576 ], [ -171.079102, -3.140516 ], [ -171.101074, -3.140516 ], [ -171.079102, -3.118576 ] ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -150.227051, -9.990491 ], [ -150.227051, -10.012130 ], [ -150.249023, -10.012130 ], [ -150.249023, -9.990491 ], [ -150.227051, -9.990491 ] ] ], [ [ [ -155.852051, -5.615986 ], [ -155.874023, -5.637853 ], [ -155.917969, -5.637853 ], [ -155.939941, -5.615986 ], [ -155.852051, -5.615986 ] ] ], [ [ [ -174.517822, -4.674980 ], [ -174.506836, -4.674980 ], [ -174.506836, -4.696879 ], [ -174.517822, -4.674980 ] ] ], [ [ [ -171.254883, -4.434044 ], [ -171.232910, -4.455951 ], [ -171.232910, -4.477856 ], [ -171.254883, -4.477856 ], [ -171.254883, -4.434044 ] ] ], [ [ [ -171.079102, -3.118576 ], [ -171.079102, -3.140516 ], [ -171.101074, -3.140516 ], [ -171.079102, -3.118576 ] ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -196,19 +196,19 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 7, "x": 1, "y": 65 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 128 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -174.550781, -4.653080 ], [ -174.528809, -4.653080 ], [ -174.528809, -4.674980 ], [ -174.550781, -4.674980 ], [ -174.550781, -4.653080 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -174.550781, -4.653080 ], [ -174.506836, -4.674980 ], [ -174.506836, -4.696879 ], [ -174.528809, -4.674980 ], [ -174.550781, -4.653080 ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 7, "x": 3, "y": 65 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 128 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -171.254883, -4.434044 ], [ -171.232910, -4.477856 ], [ -171.254883, -4.477856 ], [ -171.254883, -4.434044 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -171.254883, -4.434044 ], [ -171.232910, -4.455951 ], [ -171.232910, -4.477856 ], [ -171.254883, -4.434044 ] ] ], [ [ [ -171.079102, -3.118576 ], [ -171.079102, -3.140516 ], [ -171.101074, -3.140516 ], [ -171.079102, -3.118576 ] ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 7, "x": 8, "y": 66 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 128 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -155.852051, -5.615986 ], [ -155.874023, -5.637853 ], [ -155.939941, -5.615986 ], [ -155.852051, -5.615986 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -155.939941, -5.594118 ], [ -155.895996, -5.594118 ], [ -155.895996, -5.637853 ], [ -155.939941, -5.637853 ], [ -155.939941, -5.594118 ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -220,25 +220,25 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 7, "x": 10, "y": 67 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 128 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -150.227051, -9.968851 ], [ -150.205078, -9.968851 ], [ -150.205078, -9.990491 ], [ -150.227051, -9.990491 ], [ -150.227051, -9.968851 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -150.227051, -9.990491 ], [ -150.227051, -10.012130 ], [ -150.249023, -9.990491 ], [ -150.227051, -9.990491 ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 7, "x": 113, "y": 60 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 128 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "FSM-4943", "OBJECTID_1": 6464, "diss_me": 4943, "adm1_cod_1": "FSM-4943", "iso_3166_2": "FM-YAP", "wikipedia": "http://en.wikipedia.org/wiki/Yap_State", "iso_a2": "FM", "adm0_sr": 5, "name": "Yap", "code_hasc": "FM.YA", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 10, "datarank": 10, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 scale rank", "name_len": 3, "mapcolor9": 4, "mapcolor13": 13, "fips": "FM04", "woe_id": 2345343, "woe_label": "Yap, FM, Federated States of Micronesia", "woe_name": "Yap", "latitude": 9.581009, "longitude": 138.114, "sov_a3": "FSM", "adm0_a3": "FSM", "adm0_label": 5, "admin": "Federated States of Micronesia", "geonunit": "Federated States of Micronesia", "gu_a3": "FSM", "gn_id": 2081175, "gn_name": "State of Yap", "gns_id": -3741502, "gns_name": "Yap, State of", "gn_level": 1, "gn_a1_code": "FM.04", "gns_level": 1, "gns_adm1": "FM04" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 138.164062, 9.579084 ], [ 138.186035, 9.535749 ], [ 138.229980, 9.557417 ], [ 138.186035, 9.492408 ], [ 138.164062, 9.535749 ], [ 138.076172, 9.405710 ], [ 138.054199, 9.427387 ], [ 138.142090, 9.579084 ], [ 138.142090, 9.535749 ], [ 138.164062, 9.579084 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "FSM-4943", "OBJECTID_1": 6464, "diss_me": 4943, "adm1_cod_1": "FSM-4943", "iso_3166_2": "FM-YAP", "wikipedia": "http://en.wikipedia.org/wiki/Yap_State", "iso_a2": "FM", "adm0_sr": 5, "name": "Yap", "code_hasc": "FM.YA", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 10, "datarank": 10, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 scale rank", "name_len": 3, "mapcolor9": 4, "mapcolor13": 13, "fips": "FM04", "woe_id": 2345343, "woe_label": "Yap, FM, Federated States of Micronesia", "woe_name": "Yap", "latitude": 9.581009, "longitude": 138.114, "sov_a3": "FSM", "adm0_a3": "FSM", "adm0_label": 5, "admin": "Federated States of Micronesia", "geonunit": "Federated States of Micronesia", "gu_a3": "FSM", "gn_id": 2081175, "gn_name": "State of Yap", "gns_id": -3741502, "gns_name": "Yap, State of", "gn_level": 1, "gn_a1_code": "FM.04", "gns_level": 1, "gns_adm1": "FM04" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 138.164062, 9.579084 ], [ 138.186035, 9.535749 ], [ 138.229980, 9.557417 ], [ 138.186035, 9.492408 ], [ 138.164062, 9.535749 ], [ 138.076172, 9.405710 ], [ 138.054199, 9.427387 ], [ 138.142090, 9.579084 ], [ 138.142090, 9.535749 ], [ 138.164062, 9.579084 ] ] ], [ [ [ 140.537109, 9.774025 ], [ 140.515137, 9.752370 ], [ 140.515137, 9.774025 ], [ 140.537109, 9.774025 ] ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 7, "x": 115, "y": 61 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 128 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "FSM-4943", "OBJECTID_1": 6464, "diss_me": 4943, "adm1_cod_1": "FSM-4943", "iso_3166_2": "FM-YAP", "wikipedia": "http://en.wikipedia.org/wiki/Yap_State", "iso_a2": "FM", "adm0_sr": 5, "name": "Yap", "code_hasc": "FM.YA", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 10, "datarank": 10, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 scale rank", "name_len": 3, "mapcolor9": 4, "mapcolor13": 13, "fips": "FM04", "woe_id": 2345343, "woe_label": "Yap, FM, Federated States of Micronesia", "woe_name": "Yap", "latitude": 9.581009, "longitude": 138.114, "sov_a3": "FSM", "adm0_a3": "FSM", "adm0_label": 5, "admin": "Federated States of Micronesia", "geonunit": "Federated States of Micronesia", "gu_a3": "FSM", "gn_id": 2081175, "gn_name": "State of Yap", "gns_id": -3741502, "gns_name": "Yap, State of", "gn_level": 1, "gn_a1_code": "FM.04", "gns_level": 1, "gns_adm1": "FM04" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 143.876953, 7.384258 ], [ 143.898926, 7.384258 ], [ 143.898926, 7.362467 ], [ 143.876953, 7.362467 ], [ 143.876953, 7.384258 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "FSM-4943", "OBJECTID_1": 6464, "diss_me": 4943, "adm1_cod_1": "FSM-4943", "iso_3166_2": "FM-YAP", "wikipedia": "http://en.wikipedia.org/wiki/Yap_State", "iso_a2": "FM", "adm0_sr": 5, "name": "Yap", "code_hasc": "FM.YA", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 10, "datarank": 10, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 scale rank", "name_len": 3, "mapcolor9": 4, "mapcolor13": 13, "fips": "FM04", "woe_id": 2345343, "woe_label": "Yap, FM, Federated States of Micronesia", "woe_name": "Yap", "latitude": 9.581009, "longitude": 138.114, "sov_a3": "FSM", "adm0_a3": "FSM", "adm0_label": 5, "admin": "Federated States of Micronesia", "geonunit": "Federated States of Micronesia", "gu_a3": "FSM", "gn_id": 2081175, "gn_name": "State of Yap", "gns_id": -3741502, "gns_name": "Yap, State of", "gn_level": 1, "gn_a1_code": "FM.04", "gns_level": 1, "gns_adm1": "FM04" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 143.920898, 7.384258 ], [ 143.920898, 7.362467 ], [ 143.898926, 7.362467 ], [ 143.920898, 7.384258 ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 7, "x": 125, "y": 63 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 128 }, "features": [
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 173.518066, 0.285643 ], [ 173.562012, 0.285643 ], [ 173.562012, 0.241699 ], [ 173.518066, 0.241699 ], [ 173.518066, 0.285643 ] ] ] } }
|
||||
{ "type": "Feature", "properties": { "adm1_code": "KIR+99?", "OBJECTID_1": 3643, "diss_me": 10097, "adm1_cod_1": "KIR+99?", "iso_3166_2": "KI-", "iso_a2": "KI", "adm0_sr": 5, "code_hasc": "-99", "note": "KIR-99 (Kiribati minor island)", "provnum_ne": 0, "gadm_level": 0, "check_me": 0, "scalerank": 11, "datarank": 11, "area_sqkm": 0, "sameascity": -99, "labelrank": 20, "featurecla": "Admin-1 minor island", "name_len": 0, "mapcolor9": 6, "mapcolor13": 12, "woe_id": -99, "latitude": -4.689669, "longitude": -174.511, "sov_a3": "KIR", "adm0_a3": "KIR", "adm0_label": 7, "admin": "Kiribati", "geonunit": "Kiribati", "gu_a3": "KIR", "gn_id": 0, "gns_id": 0, "gn_level": 0, "gn_a1_code": "KI.", "gns_level": 0 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 173.408203, 0.219726 ], [ 173.408203, 0.197754 ], [ 173.386230, 0.219726 ], [ 173.408203, 0.219726 ] ] ], [ [ [ 173.364258, 0.263671 ], [ 173.364258, 0.241699 ], [ 173.342285, 0.263671 ], [ 173.364258, 0.263671 ] ] ], [ [ [ 173.935547, 0.395505 ], [ 173.957520, 0.351560 ], [ 173.935547, 0.307616 ], [ 173.935547, 0.395505 ] ] ] ] } }
|
||||
] }
|
||||
] }
|
||||
] }
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+1073
-1073
File diff suppressed because one or more lines are too long
@@ -2,13 +2,13 @@
|
||||
"antimeridian_adjusted_bounds": "237.656250,37.857507,237.744141,37.926868",
|
||||
"attribution": "macarthur's attribution",
|
||||
"bounds": "-122.343750,37.695438,-122.104097,37.926868",
|
||||
"center": "-122.299805,37.892187,12",
|
||||
"center": "-122.299805,37.892187,11",
|
||||
"description": "macarthur description",
|
||||
"format": "pbf",
|
||||
"generator_options": "./tippecanoe -q -f -Z5 -z10 -o tests/join-population/macarthur.mbtiles -l macarthur tests/join-population/macarthur.json; ./tippecanoe -q -f -d10 -D10 -Z9 -z11 -o tests/join-population/macarthur2.mbtiles -l macarthur tests/join-population/macarthur2.json; ./tippecanoe -q -f -z12 -o tests/join-population/tabblock_06001420.mbtiles '-YALAND10:Land area' '-L{\"file\": \"tests/join-population/tabblock_06001420.json\", \"description\": \"population\"}'; ./tile-join -q -f -o tests/join-population/merged.mbtiles tests/join-population/tabblock_06001420.mbtiles tests/join-population/macarthur.mbtiles tests/join-population/macarthur2.mbtiles; ./tile-join -q -f -l macarthur -n 'macarthur name' -N 'macarthur description' -A 'macarthur'\"'\"'s attribution' -o tests/join-population/just-macarthur.mbtiles tests/join-population/merged.mbtiles",
|
||||
"json": "{\"vector_layers\":[{\"id\":\"macarthur\",\"description\":\"\",\"minzoom\":5,\"maxzoom\":11,\"fields\":{\"FULLNAME\":\"String\",\"LINEARID\":\"String\",\"MTFCC\":\"String\",\"RTTYP\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"macarthur\",\"count\":171,\"geometry\":\"LineString\",\"attributeCount\":4,\"attributes\":[{\"attribute\":\"FULLNAME\",\"count\":5,\"type\":\"string\",\"values\":[\"Macarthur\",\"Macarthur Blvd\",\"Macarthur Fwy\",\"W Macarthur\",\"W Macarthur Blvd\"]},{\"attribute\":\"LINEARID\",\"count\":42,\"type\":\"string\",\"values\":[\"1102155930810\",\"1102156217102\",\"1102156241736\",\"1102156248968\",\"1102156510290\",\"1102157651658\",\"1102406970092\",\"1102406970093\",\"1102406970094\",\"1102406970095\",\"1102407366406\",\"1102638069562\",\"1102638078801\",\"1102654601627\",\"1102654601663\",\"1102654602215\",\"1102954189105\",\"1102954918511\",\"1103690383700\",\"1103690474249\",\"1103690474250\",\"1103690483026\",\"1103690483032\",\"1103717593123\",\"1104469713187\",\"1104469713198\",\"1104474748623\",\"1104475134288\",\"1104475134436\",\"1104485605278\",\"1104485645649\",\"1104485773833\",\"1104486090991\",\"1104486392881\",\"1105089436004\",\"1105089465114\",\"1105089465116\",\"1105281275434\",\"1105281275687\",\"1105281275688\",\"1105281275689\",\"1105281275692\"]},{\"attribute\":\"MTFCC\",\"count\":2,\"type\":\"string\",\"values\":[\"S1100\",\"S1400\"]},{\"attribute\":\"RTTYP\",\"count\":1,\"type\":\"string\",\"values\":[\"M\"]}]}]}}",
|
||||
"maxzoom": "12",
|
||||
"minzoom": "0",
|
||||
"maxzoom": "11",
|
||||
"minzoom": "5",
|
||||
"name": "macarthur name",
|
||||
"strategies": "[{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":260},{\"tiny_polygons\":258},{\"tiny_polygons\":255},{\"tiny_polygons\":248},{\"tiny_polygons\":151},{\"tiny_polygons\":75},{\"tiny_polygons\":47}]",
|
||||
"type": "overlay",
|
||||
@@ -114,7 +114,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 8, "x": 41, "y": 98 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "macarthur", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.105484, 37.696861 ], [ -122.109261, 37.700936 ], [ -122.116814, 37.705553 ], [ -122.120934, 37.707183 ], [ -122.124710, 37.710171 ], [ -122.128830, 37.712615 ], [ -122.131233, 37.714788 ], [ -122.133293, 37.718590 ], [ -122.137413, 37.724836 ], [ -122.140503, 37.737327 ], [ -122.143936, 37.740313 ], [ -122.145653, 37.742757 ], [ -122.148743, 37.745472 ], [ -122.151489, 37.750087 ], [ -122.151489, 37.752801 ], [ -122.148056, 37.756873 ], [ -122.147713, 37.759587 ], [ -122.155266, 37.770986 ], [ -122.157326, 37.772886 ], [ -122.169342, 37.778856 ], [ -122.177582, 37.783469 ], [ -122.179642, 37.784011 ], [ -122.188568, 37.784283 ], [ -122.194061, 37.785911 ], [ -122.199898, 37.788895 ], [ -122.205048, 37.794050 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797306 ], [ -122.228394, 37.800832 ], [ -122.236633, 37.806258 ], [ -122.241783, 37.808428 ], [ -122.248306, 37.810326 ], [ -122.250023, 37.811683 ], [ -122.251396, 37.816565 ], [ -122.252769, 37.818192 ], [ -122.255859, 37.820633 ], [ -122.258949, 37.821989 ], [ -122.281609, 37.827413 ], [ -122.284012, 37.827413 ], [ -122.287445, 37.826599 ], [ -122.289848, 37.826870 ], [ -122.292938, 37.828497 ], [ -122.293282, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.105484, 37.696861 ], [ -122.109261, 37.700936 ], [ -122.116814, 37.705553 ], [ -122.120934, 37.707183 ], [ -122.124710, 37.710171 ], [ -122.128830, 37.712615 ], [ -122.131233, 37.714788 ], [ -122.133293, 37.718590 ], [ -122.137413, 37.724836 ], [ -122.140503, 37.737327 ], [ -122.143936, 37.740313 ], [ -122.145653, 37.742757 ], [ -122.148743, 37.745472 ], [ -122.151489, 37.750087 ], [ -122.151489, 37.752801 ], [ -122.148056, 37.756873 ], [ -122.147713, 37.759587 ], [ -122.155266, 37.770986 ], [ -122.157326, 37.772886 ], [ -122.169342, 37.778856 ], [ -122.177582, 37.783469 ], [ -122.179642, 37.784011 ], [ -122.188568, 37.784283 ], [ -122.194061, 37.785911 ], [ -122.199898, 37.788895 ], [ -122.205048, 37.794050 ], [ -122.209511, 37.796221 ], [ -122.216721, 37.798391 ], [ -122.228394, 37.800832 ], [ -122.236633, 37.806258 ], [ -122.241783, 37.808428 ], [ -122.248306, 37.810326 ], [ -122.250023, 37.811683 ], [ -122.251396, 37.816565 ], [ -122.252769, 37.818192 ], [ -122.255859, 37.820633 ], [ -122.258949, 37.821989 ], [ -122.281609, 37.827413 ], [ -122.284012, 37.827413 ], [ -122.287445, 37.826599 ], [ -122.289848, 37.826870 ], [ -122.292938, 37.828497 ], [ -122.293282, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486392881", "FULLNAME": "W Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254829, 37.821446 ], [ -122.256889, 37.823345 ], [ -122.259293, 37.824701 ], [ -122.265816, 37.826599 ], [ -122.271652, 37.827413 ] ] } }
|
||||
,
|
||||
@@ -122,7 +122,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102654602215", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817107 ], [ -122.252426, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294655, 37.833107 ], [ -122.293625, 37.828497 ], [ -122.290878, 37.826870 ], [ -122.287788, 37.826328 ], [ -122.283325, 37.827141 ], [ -122.280922, 37.827141 ], [ -122.258949, 37.821718 ], [ -122.254143, 37.819277 ], [ -122.252769, 37.817921 ], [ -122.251740, 37.816022 ], [ -122.250366, 37.811954 ], [ -122.248650, 37.810326 ], [ -122.238693, 37.806800 ], [ -122.234230, 37.804630 ], [ -122.228394, 37.800832 ], [ -122.216377, 37.798120 ], [ -122.209854, 37.796221 ], [ -122.204704, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.188911, 37.784283 ], [ -122.178268, 37.783469 ], [ -122.157326, 37.772614 ], [ -122.155266, 37.770443 ], [ -122.148056, 37.759587 ], [ -122.148056, 37.757959 ], [ -122.148399, 37.756601 ], [ -122.151833, 37.752801 ], [ -122.151489, 37.750087 ], [ -122.148743, 37.744929 ], [ -122.145653, 37.742214 ], [ -122.143936, 37.740042 ], [ -122.140503, 37.737055 ], [ -122.137756, 37.725108 ], [ -122.133293, 37.718590 ], [ -122.131233, 37.714245 ], [ -122.129173, 37.712344 ], [ -122.124367, 37.709628 ], [ -122.121620, 37.707455 ], [ -122.111664, 37.702294 ], [ -122.108231, 37.699578 ], [ -122.105827, 37.696861 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294655, 37.833107 ], [ -122.293625, 37.828497 ], [ -122.290878, 37.826870 ], [ -122.287788, 37.826328 ], [ -122.283325, 37.827141 ], [ -122.280922, 37.827141 ], [ -122.258949, 37.821718 ], [ -122.254143, 37.819277 ], [ -122.252769, 37.817921 ], [ -122.251740, 37.816022 ], [ -122.250366, 37.811954 ], [ -122.248650, 37.810326 ], [ -122.238693, 37.806800 ], [ -122.234230, 37.804630 ], [ -122.228394, 37.800832 ], [ -122.216377, 37.798120 ], [ -122.209854, 37.796221 ], [ -122.204704, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.188911, 37.784283 ], [ -122.178268, 37.783469 ], [ -122.157326, 37.772614 ], [ -122.155266, 37.770443 ], [ -122.148056, 37.759587 ], [ -122.148056, 37.757959 ], [ -122.148399, 37.756601 ], [ -122.151833, 37.752801 ], [ -122.151489, 37.750087 ], [ -122.148743, 37.744929 ], [ -122.145653, 37.742214 ], [ -122.140503, 37.737055 ], [ -122.137756, 37.725108 ], [ -122.133293, 37.718590 ], [ -122.131233, 37.714245 ], [ -122.129173, 37.712344 ], [ -122.124367, 37.709628 ], [ -122.121620, 37.707455 ], [ -122.111664, 37.702294 ], [ -122.108231, 37.699578 ], [ -122.105827, 37.696861 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241440, 37.807343 ], [ -122.237320, 37.805715 ] ] } }
|
||||
,
|
||||
@@ -162,7 +162,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 9, "x": 82, "y": 197 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "macarthur", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.121449, 37.707726 ], [ -122.124882, 37.710307 ], [ -122.128315, 37.712072 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715060 ], [ -122.133121, 37.718590 ], [ -122.137241, 37.724836 ], [ -122.138271, 37.729724 ], [ -122.140503, 37.737327 ], [ -122.141190, 37.738277 ], [ -122.143764, 37.740313 ], [ -122.145481, 37.742621 ], [ -122.148743, 37.745200 ], [ -122.151318, 37.750222 ], [ -122.151661, 37.751580 ], [ -122.151489, 37.752801 ], [ -122.150803, 37.754158 ], [ -122.148399, 37.756466 ], [ -122.147713, 37.757823 ], [ -122.147713, 37.759587 ], [ -122.148743, 37.761623 ], [ -122.152519, 37.766644 ], [ -122.154579, 37.770172 ], [ -122.155437, 37.771258 ], [ -122.157326, 37.772886 ], [ -122.163849, 37.776414 ], [ -122.169514, 37.778856 ], [ -122.173977, 37.781298 ], [ -122.177582, 37.783604 ], [ -122.179642, 37.784011 ], [ -122.187881, 37.784283 ], [ -122.192173, 37.785232 ], [ -122.194405, 37.786046 ], [ -122.199726, 37.788895 ], [ -122.205048, 37.793915 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797441 ], [ -122.228909, 37.801104 ], [ -122.230110, 37.801782 ], [ -122.234230, 37.804901 ], [ -122.236462, 37.806122 ], [ -122.241955, 37.808563 ], [ -122.248821, 37.810598 ], [ -122.249508, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251396, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.258778, 37.821989 ], [ -122.260838, 37.822667 ], [ -122.281437, 37.827548 ], [ -122.283669, 37.827548 ], [ -122.287445, 37.826735 ], [ -122.289677, 37.827006 ], [ -122.291393, 37.827548 ], [ -122.292767, 37.828362 ], [ -122.293453, 37.829853 ], [ -122.293282, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.121449, 37.707726 ], [ -122.124882, 37.710307 ], [ -122.128315, 37.712072 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715060 ], [ -122.133121, 37.718590 ], [ -122.137241, 37.724836 ], [ -122.138271, 37.729724 ], [ -122.140503, 37.737327 ], [ -122.141190, 37.738277 ], [ -122.143764, 37.740313 ], [ -122.145481, 37.742621 ], [ -122.148743, 37.745200 ], [ -122.151318, 37.750222 ], [ -122.151661, 37.751580 ], [ -122.151489, 37.752801 ], [ -122.150803, 37.754158 ], [ -122.149086, 37.755651 ], [ -122.148056, 37.757144 ], [ -122.147713, 37.758501 ], [ -122.147713, 37.759587 ], [ -122.148743, 37.761623 ], [ -122.152519, 37.766644 ], [ -122.154579, 37.770172 ], [ -122.155437, 37.771258 ], [ -122.157326, 37.772886 ], [ -122.163849, 37.776414 ], [ -122.169514, 37.778856 ], [ -122.173977, 37.781298 ], [ -122.177582, 37.783604 ], [ -122.179642, 37.784011 ], [ -122.187881, 37.784283 ], [ -122.192173, 37.785232 ], [ -122.194405, 37.786046 ], [ -122.199726, 37.788895 ], [ -122.205048, 37.793915 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797441 ], [ -122.228909, 37.801104 ], [ -122.230110, 37.801782 ], [ -122.234230, 37.804901 ], [ -122.236462, 37.806122 ], [ -122.241955, 37.808563 ], [ -122.248821, 37.810598 ], [ -122.249508, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251396, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.258778, 37.821989 ], [ -122.260838, 37.822667 ], [ -122.281437, 37.827548 ], [ -122.283669, 37.827548 ], [ -122.287445, 37.826735 ], [ -122.289677, 37.827006 ], [ -122.291393, 37.827548 ], [ -122.292767, 37.828362 ], [ -122.293453, 37.829853 ], [ -122.293282, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486392881", "FULLNAME": "W Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254658, 37.821446 ], [ -122.255173, 37.822124 ], [ -122.257404, 37.823752 ], [ -122.259293, 37.824565 ], [ -122.263584, 37.825650 ], [ -122.265816, 37.826599 ], [ -122.271652, 37.827548 ] ] } }
|
||||
,
|
||||
@@ -170,7 +170,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102654602215", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817107 ], [ -122.252254, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294483, 37.832972 ], [ -122.293968, 37.831751 ], [ -122.293625, 37.828497 ], [ -122.292938, 37.827955 ], [ -122.291222, 37.827006 ], [ -122.289677, 37.826328 ], [ -122.287960, 37.826328 ], [ -122.282810, 37.827277 ], [ -122.280922, 37.827141 ], [ -122.268391, 37.824158 ], [ -122.261868, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.254143, 37.819141 ], [ -122.252769, 37.817921 ], [ -122.251568, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810733 ], [ -122.248650, 37.810326 ], [ -122.242470, 37.808428 ], [ -122.238522, 37.806936 ], [ -122.234230, 37.804766 ], [ -122.230282, 37.801646 ], [ -122.228394, 37.800697 ], [ -122.216377, 37.798120 ], [ -122.210026, 37.796221 ], [ -122.204876, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.190113, 37.784418 ], [ -122.188396, 37.784147 ], [ -122.179470, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.170029, 37.778992 ], [ -122.163162, 37.775871 ], [ -122.157497, 37.772750 ], [ -122.155952, 37.771529 ], [ -122.154408, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.148914, 37.761487 ], [ -122.147884, 37.759451 ], [ -122.147884, 37.757959 ], [ -122.148571, 37.756601 ], [ -122.150974, 37.754294 ], [ -122.151833, 37.752801 ], [ -122.151833, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149601, 37.746150 ], [ -122.148743, 37.744929 ], [ -122.145481, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141018, 37.737598 ], [ -122.140503, 37.736919 ], [ -122.138443, 37.729453 ], [ -122.137585, 37.724972 ], [ -122.137070, 37.723886 ], [ -122.134323, 37.720220 ], [ -122.133293, 37.718590 ], [ -122.131577, 37.714924 ], [ -122.130032, 37.713023 ], [ -122.128143, 37.711665 ], [ -122.124367, 37.709628 ], [ -122.121792, 37.707726 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294483, 37.832972 ], [ -122.293968, 37.831751 ], [ -122.293625, 37.828497 ], [ -122.292938, 37.827955 ], [ -122.291222, 37.827006 ], [ -122.289677, 37.826328 ], [ -122.287960, 37.826328 ], [ -122.282810, 37.827277 ], [ -122.280922, 37.827141 ], [ -122.268391, 37.824158 ], [ -122.261868, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.254143, 37.819141 ], [ -122.252769, 37.817921 ], [ -122.251568, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810733 ], [ -122.248650, 37.810326 ], [ -122.242470, 37.808428 ], [ -122.238522, 37.806936 ], [ -122.234230, 37.804766 ], [ -122.230282, 37.801646 ], [ -122.228394, 37.800697 ], [ -122.216377, 37.798120 ], [ -122.210026, 37.796221 ], [ -122.204876, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.190113, 37.784418 ], [ -122.188396, 37.784147 ], [ -122.179470, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.170029, 37.778992 ], [ -122.163162, 37.775871 ], [ -122.157497, 37.772750 ], [ -122.155609, 37.771122 ], [ -122.154408, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.148914, 37.761487 ], [ -122.147884, 37.759451 ], [ -122.147884, 37.757959 ], [ -122.148571, 37.756601 ], [ -122.150974, 37.754294 ], [ -122.151833, 37.752801 ], [ -122.151833, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149601, 37.746150 ], [ -122.148743, 37.744929 ], [ -122.145481, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141018, 37.737598 ], [ -122.140503, 37.736919 ], [ -122.138443, 37.729453 ], [ -122.137585, 37.724972 ], [ -122.137070, 37.723886 ], [ -122.134323, 37.720220 ], [ -122.133293, 37.718590 ], [ -122.131577, 37.714924 ], [ -122.130032, 37.713023 ], [ -122.128143, 37.711665 ], [ -122.124367, 37.709628 ], [ -122.121792, 37.707726 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241440, 37.807207 ], [ -122.240925, 37.806800 ], [ -122.239380, 37.806665 ], [ -122.238350, 37.805986 ], [ -122.237148, 37.805580 ] ] } }
|
||||
,
|
||||
@@ -192,7 +192,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690474249", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.158871, 37.749951 ], [ -122.157669, 37.748186 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690474250", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.142906, 37.738141 ], [ -122.151318, 37.742214 ], [ -122.153378, 37.743978 ], [ -122.156296, 37.746015 ], [ -122.157154, 37.747372 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690474250", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.142906, 37.738141 ], [ -122.151318, 37.742214 ], [ -122.154751, 37.745064 ], [ -122.156296, 37.746015 ], [ -122.157154, 37.747372 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104485645649", "FULLNAME": "W Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.279892, 37.828768 ], [ -122.284698, 37.827684 ] ] } }
|
||||
,
|
||||
@@ -254,7 +254,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 10, "x": 164, "y": 395 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "macarthur", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.129774, 37.713159 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715128 ], [ -122.133121, 37.718590 ], [ -122.134151, 37.720356 ], [ -122.136984, 37.724157 ], [ -122.137327, 37.724836 ], [ -122.137842, 37.726873 ], [ -122.138357, 37.729792 ], [ -122.139387, 37.733186 ], [ -122.139988, 37.736105 ], [ -122.140503, 37.737327 ], [ -122.141275, 37.738277 ], [ -122.143164, 37.739702 ], [ -122.143850, 37.740381 ], [ -122.145567, 37.742689 ], [ -122.146339, 37.743368 ], [ -122.147713, 37.744250 ], [ -122.148743, 37.745200 ], [ -122.149343, 37.746082 ], [ -122.151403, 37.750222 ], [ -122.151747, 37.751580 ], [ -122.151575, 37.752869 ], [ -122.150888, 37.754158 ], [ -122.149172, 37.755651 ], [ -122.148228, 37.756805 ], [ -122.147799, 37.757823 ], [ -122.147799, 37.759587 ], [ -122.148056, 37.760401 ], [ -122.148829, 37.761691 ], [ -122.150202, 37.763794 ], [ -122.152519, 37.766712 ], [ -122.155180, 37.770918 ], [ -122.155952, 37.771732 ], [ -122.157412, 37.772954 ], [ -122.158356, 37.773564 ], [ -122.163935, 37.776414 ], [ -122.169514, 37.778924 ], [ -122.174063, 37.781366 ], [ -122.176123, 37.782655 ], [ -122.176380, 37.782926 ], [ -122.176552, 37.782926 ], [ -122.177668, 37.783604 ], [ -122.179728, 37.784079 ], [ -122.185822, 37.784215 ], [ -122.188654, 37.784418 ], [ -122.192173, 37.785232 ], [ -122.193975, 37.785911 ], [ -122.199812, 37.788895 ], [ -122.201700, 37.790523 ], [ -122.204103, 37.793168 ], [ -122.205133, 37.793982 ], [ -122.206593, 37.794796 ], [ -122.209597, 37.796221 ], [ -122.210970, 37.796831 ], [ -122.213030, 37.797441 ], [ -122.215261, 37.797916 ], [ -122.219038, 37.798933 ], [ -122.227278, 37.800629 ], [ -122.228909, 37.801104 ], [ -122.230196, 37.801850 ], [ -122.232771, 37.803952 ], [ -122.234230, 37.804969 ], [ -122.236547, 37.806190 ], [ -122.241011, 37.808224 ], [ -122.246418, 37.809784 ], [ -122.248821, 37.810598 ], [ -122.249594, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251482, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.255945, 37.820565 ], [ -122.258863, 37.821989 ], [ -122.260838, 37.822735 ], [ -122.268047, 37.824294 ], [ -122.274399, 37.825921 ], [ -122.281094, 37.827480 ], [ -122.282038, 37.827616 ], [ -122.283669, 37.827548 ], [ -122.286844, 37.826802 ], [ -122.287531, 37.826735 ], [ -122.288132, 37.826735 ], [ -122.289762, 37.827006 ], [ -122.291479, 37.827616 ], [ -122.292337, 37.828023 ], [ -122.292852, 37.828430 ], [ -122.293196, 37.828972 ], [ -122.293453, 37.829853 ], [ -122.293367, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.129774, 37.713159 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715128 ], [ -122.133121, 37.718590 ], [ -122.134151, 37.720356 ], [ -122.136984, 37.724157 ], [ -122.137327, 37.724836 ], [ -122.137842, 37.726873 ], [ -122.138357, 37.729792 ], [ -122.139387, 37.733186 ], [ -122.139988, 37.736105 ], [ -122.140503, 37.737327 ], [ -122.141275, 37.738277 ], [ -122.143164, 37.739702 ], [ -122.143850, 37.740381 ], [ -122.145567, 37.742689 ], [ -122.146339, 37.743368 ], [ -122.148142, 37.744589 ], [ -122.148743, 37.745200 ], [ -122.149343, 37.746082 ], [ -122.151403, 37.750222 ], [ -122.151747, 37.751580 ], [ -122.151575, 37.752869 ], [ -122.150888, 37.754158 ], [ -122.149172, 37.755651 ], [ -122.148228, 37.756805 ], [ -122.147799, 37.757823 ], [ -122.147799, 37.759587 ], [ -122.148056, 37.760401 ], [ -122.148829, 37.761691 ], [ -122.150202, 37.763794 ], [ -122.152519, 37.766712 ], [ -122.155180, 37.770918 ], [ -122.155952, 37.771732 ], [ -122.157412, 37.772954 ], [ -122.158356, 37.773564 ], [ -122.163935, 37.776414 ], [ -122.169514, 37.778924 ], [ -122.174063, 37.781366 ], [ -122.176123, 37.782655 ], [ -122.176380, 37.782926 ], [ -122.176552, 37.782926 ], [ -122.177668, 37.783604 ], [ -122.179728, 37.784079 ], [ -122.185822, 37.784215 ], [ -122.188654, 37.784418 ], [ -122.192173, 37.785232 ], [ -122.193975, 37.785911 ], [ -122.199812, 37.788895 ], [ -122.201700, 37.790523 ], [ -122.204103, 37.793168 ], [ -122.205133, 37.793982 ], [ -122.206593, 37.794796 ], [ -122.209597, 37.796221 ], [ -122.210970, 37.796831 ], [ -122.213030, 37.797441 ], [ -122.215261, 37.797916 ], [ -122.219038, 37.798933 ], [ -122.227278, 37.800629 ], [ -122.228909, 37.801104 ], [ -122.230196, 37.801850 ], [ -122.232771, 37.803952 ], [ -122.234230, 37.804969 ], [ -122.236547, 37.806190 ], [ -122.241955, 37.808563 ], [ -122.246418, 37.809784 ], [ -122.248821, 37.810598 ], [ -122.249594, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251482, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.255945, 37.820565 ], [ -122.258863, 37.821989 ], [ -122.260838, 37.822735 ], [ -122.268047, 37.824294 ], [ -122.274399, 37.825921 ], [ -122.281094, 37.827480 ], [ -122.282038, 37.827616 ], [ -122.283669, 37.827548 ], [ -122.286844, 37.826802 ], [ -122.287531, 37.826735 ], [ -122.288132, 37.826735 ], [ -122.289762, 37.827006 ], [ -122.291479, 37.827616 ], [ -122.292337, 37.828023 ], [ -122.292852, 37.828430 ], [ -122.293196, 37.828972 ], [ -122.293453, 37.829853 ], [ -122.293367, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102157651658", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.271652, 37.827548 ], [ -122.271738, 37.827548 ] ] } }
|
||||
,
|
||||
@@ -264,7 +264,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102654602215", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817175 ], [ -122.252340, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294569, 37.833039 ], [ -122.294054, 37.831819 ], [ -122.293797, 37.830395 ], [ -122.293882, 37.829379 ], [ -122.293625, 37.828565 ], [ -122.293024, 37.827955 ], [ -122.291050, 37.826870 ], [ -122.289677, 37.826396 ], [ -122.287960, 37.826328 ], [ -122.283497, 37.827209 ], [ -122.281008, 37.827209 ], [ -122.268476, 37.824158 ], [ -122.261953, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.256632, 37.820633 ], [ -122.254229, 37.819209 ], [ -122.252769, 37.817921 ], [ -122.251654, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810801 ], [ -122.248735, 37.810326 ], [ -122.242470, 37.808496 ], [ -122.241268, 37.808089 ], [ -122.238607, 37.806936 ], [ -122.238092, 37.806597 ], [ -122.236032, 37.805715 ], [ -122.234316, 37.804766 ], [ -122.233200, 37.804020 ], [ -122.230368, 37.801714 ], [ -122.228479, 37.800765 ], [ -122.216463, 37.798120 ], [ -122.215776, 37.797848 ], [ -122.213030, 37.797238 ], [ -122.210026, 37.796221 ], [ -122.208652, 37.795475 ], [ -122.206507, 37.794525 ], [ -122.204876, 37.793508 ], [ -122.201357, 37.789845 ], [ -122.200241, 37.788895 ], [ -122.198524, 37.787946 ], [ -122.193117, 37.785368 ], [ -122.190199, 37.784486 ], [ -122.188482, 37.784215 ], [ -122.185650, 37.784011 ], [ -122.179556, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.173719, 37.780959 ], [ -122.170029, 37.778992 ], [ -122.167711, 37.777838 ], [ -122.165651, 37.777024 ], [ -122.163248, 37.775871 ], [ -122.159214, 37.773836 ], [ -122.157497, 37.772750 ], [ -122.156038, 37.771529 ], [ -122.154493, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.150459, 37.763794 ], [ -122.148914, 37.761487 ], [ -122.147970, 37.759519 ], [ -122.147970, 37.757959 ], [ -122.148571, 37.756669 ], [ -122.150974, 37.754294 ], [ -122.151403, 37.753751 ], [ -122.151833, 37.752869 ], [ -122.151918, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149687, 37.746218 ], [ -122.148829, 37.744996 ], [ -122.148142, 37.744318 ], [ -122.146597, 37.743232 ], [ -122.145567, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141361, 37.738006 ], [ -122.140675, 37.737191 ], [ -122.140331, 37.736444 ], [ -122.139130, 37.731285 ], [ -122.138529, 37.729520 ], [ -122.138014, 37.726262 ], [ -122.137671, 37.725040 ], [ -122.137156, 37.723954 ], [ -122.134323, 37.720220 ], [ -122.133379, 37.718590 ], [ -122.131662, 37.714992 ], [ -122.130203, 37.713159 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294569, 37.833039 ], [ -122.294054, 37.831819 ], [ -122.293797, 37.830395 ], [ -122.293882, 37.829379 ], [ -122.293625, 37.828565 ], [ -122.293024, 37.827955 ], [ -122.291050, 37.826870 ], [ -122.289677, 37.826396 ], [ -122.287960, 37.826328 ], [ -122.283497, 37.827209 ], [ -122.281008, 37.827209 ], [ -122.268476, 37.824158 ], [ -122.261953, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.256632, 37.820633 ], [ -122.254229, 37.819209 ], [ -122.252769, 37.817921 ], [ -122.251654, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810801 ], [ -122.248735, 37.810326 ], [ -122.242470, 37.808496 ], [ -122.241268, 37.808089 ], [ -122.238607, 37.806936 ], [ -122.238092, 37.806597 ], [ -122.236032, 37.805715 ], [ -122.234316, 37.804766 ], [ -122.233200, 37.804020 ], [ -122.230368, 37.801714 ], [ -122.228479, 37.800765 ], [ -122.216463, 37.798120 ], [ -122.215776, 37.797848 ], [ -122.213030, 37.797238 ], [ -122.210026, 37.796221 ], [ -122.208652, 37.795475 ], [ -122.206507, 37.794525 ], [ -122.204876, 37.793508 ], [ -122.201357, 37.789845 ], [ -122.200241, 37.788895 ], [ -122.198524, 37.787946 ], [ -122.193117, 37.785368 ], [ -122.190199, 37.784486 ], [ -122.188482, 37.784215 ], [ -122.185650, 37.784011 ], [ -122.179556, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.173719, 37.780959 ], [ -122.170029, 37.778992 ], [ -122.167711, 37.777838 ], [ -122.165651, 37.777024 ], [ -122.163248, 37.775871 ], [ -122.159214, 37.773836 ], [ -122.157497, 37.772750 ], [ -122.155695, 37.771122 ], [ -122.154493, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.150459, 37.763794 ], [ -122.148914, 37.761487 ], [ -122.147970, 37.759519 ], [ -122.147970, 37.757959 ], [ -122.148571, 37.756669 ], [ -122.150974, 37.754294 ], [ -122.151403, 37.753751 ], [ -122.151833, 37.752869 ], [ -122.151918, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149687, 37.746218 ], [ -122.148829, 37.744996 ], [ -122.148142, 37.744318 ], [ -122.146597, 37.743232 ], [ -122.145567, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141361, 37.738006 ], [ -122.140675, 37.737191 ], [ -122.140331, 37.736444 ], [ -122.139130, 37.731285 ], [ -122.138529, 37.729520 ], [ -122.138014, 37.726262 ], [ -122.137671, 37.725040 ], [ -122.137156, 37.723954 ], [ -122.134323, 37.720220 ], [ -122.133379, 37.718590 ], [ -122.131662, 37.714992 ], [ -122.130203, 37.713159 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241526, 37.807275 ], [ -122.241440, 37.807071 ], [ -122.241011, 37.806868 ], [ -122.239552, 37.806732 ], [ -122.238436, 37.806054 ], [ -122.237234, 37.805647 ] ] } }
|
||||
,
|
||||
@@ -364,7 +364,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105089436004", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252426, 37.816293 ], [ -122.251225, 37.813717 ], [ -122.250710, 37.811547 ], [ -122.249680, 37.810598 ], [ -122.248306, 37.809920 ], [ -122.246933, 37.809648 ], [ -122.246075, 37.809106 ], [ -122.242470, 37.808021 ], [ -122.241440, 37.806936 ], [ -122.239552, 37.806665 ], [ -122.238522, 37.805986 ], [ -122.235947, 37.805173 ], [ -122.233715, 37.803952 ], [ -122.229767, 37.800832 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227879, 37.801375 ], [ -122.220325, 37.799883 ], [ -122.219810, 37.800019 ], [ -122.218952, 37.800968 ], [ -122.218609, 37.800968 ], [ -122.209339, 37.798527 ], [ -122.207794, 37.798662 ], [ -122.206764, 37.798255 ], [ -122.204876, 37.797306 ], [ -122.201443, 37.794593 ], [ -122.194920, 37.787267 ], [ -122.193375, 37.785911 ], [ -122.192345, 37.785504 ], [ -122.190285, 37.785232 ], [ -122.189083, 37.784825 ], [ -122.188568, 37.784554 ], [ -122.188225, 37.783740 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227879, 37.801375 ], [ -122.220325, 37.799883 ], [ -122.219639, 37.800154 ], [ -122.218952, 37.800968 ], [ -122.218609, 37.800968 ], [ -122.209339, 37.798527 ], [ -122.207794, 37.798662 ], [ -122.206764, 37.798255 ], [ -122.204876, 37.797306 ], [ -122.201443, 37.794593 ], [ -122.194920, 37.787267 ], [ -122.193375, 37.785911 ], [ -122.192345, 37.785504 ], [ -122.190285, 37.785232 ], [ -122.189083, 37.784825 ], [ -122.188568, 37.784554 ], [ -122.188225, 37.783740 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103717593123", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227879, 37.801375 ], [ -122.220669, 37.800019 ], [ -122.219982, 37.800019 ], [ -122.219467, 37.800697 ], [ -122.218781, 37.801104 ], [ -122.208996, 37.798527 ], [ -122.207623, 37.798662 ], [ -122.204876, 37.797441 ], [ -122.201099, 37.794457 ], [ -122.194748, 37.787267 ], [ -122.193203, 37.785911 ], [ -122.189941, 37.785232 ], [ -122.188225, 37.784554 ], [ -122.187538, 37.784554 ] ] } }
|
||||
,
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 8, "x": 41, "y": 98 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "macarthur", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.105484, 37.696861 ], [ -122.109261, 37.700936 ], [ -122.116814, 37.705553 ], [ -122.120934, 37.707183 ], [ -122.124710, 37.710171 ], [ -122.128830, 37.712615 ], [ -122.131233, 37.714788 ], [ -122.133293, 37.718590 ], [ -122.137413, 37.724836 ], [ -122.140503, 37.737327 ], [ -122.143936, 37.740313 ], [ -122.145653, 37.742757 ], [ -122.148743, 37.745472 ], [ -122.151489, 37.750087 ], [ -122.151489, 37.752801 ], [ -122.148056, 37.756873 ], [ -122.147713, 37.759587 ], [ -122.155266, 37.770986 ], [ -122.157326, 37.772886 ], [ -122.169342, 37.778856 ], [ -122.177582, 37.783469 ], [ -122.179642, 37.784011 ], [ -122.188568, 37.784283 ], [ -122.194061, 37.785911 ], [ -122.199898, 37.788895 ], [ -122.205048, 37.794050 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797306 ], [ -122.228394, 37.800832 ], [ -122.236633, 37.806258 ], [ -122.241783, 37.808428 ], [ -122.248306, 37.810326 ], [ -122.250023, 37.811683 ], [ -122.251396, 37.816565 ], [ -122.252769, 37.818192 ], [ -122.255859, 37.820633 ], [ -122.258949, 37.821989 ], [ -122.281609, 37.827413 ], [ -122.284012, 37.827413 ], [ -122.287445, 37.826599 ], [ -122.289848, 37.826870 ], [ -122.292938, 37.828497 ], [ -122.293282, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.105484, 37.696861 ], [ -122.109261, 37.700936 ], [ -122.116814, 37.705553 ], [ -122.120934, 37.707183 ], [ -122.124710, 37.710171 ], [ -122.128830, 37.712615 ], [ -122.131233, 37.714788 ], [ -122.133293, 37.718590 ], [ -122.137413, 37.724836 ], [ -122.140503, 37.737327 ], [ -122.143936, 37.740313 ], [ -122.145653, 37.742757 ], [ -122.148743, 37.745472 ], [ -122.151489, 37.750087 ], [ -122.151489, 37.752801 ], [ -122.148056, 37.756873 ], [ -122.147713, 37.759587 ], [ -122.155266, 37.770986 ], [ -122.157326, 37.772886 ], [ -122.169342, 37.778856 ], [ -122.177582, 37.783469 ], [ -122.179642, 37.784011 ], [ -122.188568, 37.784283 ], [ -122.194061, 37.785911 ], [ -122.199898, 37.788895 ], [ -122.205048, 37.794050 ], [ -122.209511, 37.796221 ], [ -122.216721, 37.798391 ], [ -122.228394, 37.800832 ], [ -122.236633, 37.806258 ], [ -122.241783, 37.808428 ], [ -122.248306, 37.810326 ], [ -122.250023, 37.811683 ], [ -122.251396, 37.816565 ], [ -122.252769, 37.818192 ], [ -122.255859, 37.820633 ], [ -122.258949, 37.821989 ], [ -122.281609, 37.827413 ], [ -122.284012, 37.827413 ], [ -122.287445, 37.826599 ], [ -122.289848, 37.826870 ], [ -122.292938, 37.828497 ], [ -122.293282, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254829, 37.821446 ], [ -122.256889, 37.823345 ], [ -122.259293, 37.824701 ], [ -122.265816, 37.826599 ], [ -122.271652, 37.827413 ] ] } }
|
||||
,
|
||||
@@ -96,7 +96,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817107 ], [ -122.252426, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294655, 37.833107 ], [ -122.293625, 37.828497 ], [ -122.290878, 37.826870 ], [ -122.287788, 37.826328 ], [ -122.283325, 37.827141 ], [ -122.280922, 37.827141 ], [ -122.258949, 37.821718 ], [ -122.254143, 37.819277 ], [ -122.252769, 37.817921 ], [ -122.251740, 37.816022 ], [ -122.250366, 37.811954 ], [ -122.248650, 37.810326 ], [ -122.238693, 37.806800 ], [ -122.234230, 37.804630 ], [ -122.228394, 37.800832 ], [ -122.216377, 37.798120 ], [ -122.209854, 37.796221 ], [ -122.204704, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.188911, 37.784283 ], [ -122.178268, 37.783469 ], [ -122.157326, 37.772614 ], [ -122.155266, 37.770443 ], [ -122.148056, 37.759587 ], [ -122.148056, 37.757959 ], [ -122.148399, 37.756601 ], [ -122.151833, 37.752801 ], [ -122.151489, 37.750087 ], [ -122.148743, 37.744929 ], [ -122.145653, 37.742214 ], [ -122.143936, 37.740042 ], [ -122.140503, 37.737055 ], [ -122.137756, 37.725108 ], [ -122.133293, 37.718590 ], [ -122.131233, 37.714245 ], [ -122.129173, 37.712344 ], [ -122.124367, 37.709628 ], [ -122.121620, 37.707455 ], [ -122.111664, 37.702294 ], [ -122.108231, 37.699578 ], [ -122.105827, 37.696861 ] ] } }
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294655, 37.833107 ], [ -122.293625, 37.828497 ], [ -122.290878, 37.826870 ], [ -122.287788, 37.826328 ], [ -122.283325, 37.827141 ], [ -122.280922, 37.827141 ], [ -122.258949, 37.821718 ], [ -122.254143, 37.819277 ], [ -122.252769, 37.817921 ], [ -122.251740, 37.816022 ], [ -122.250366, 37.811954 ], [ -122.248650, 37.810326 ], [ -122.238693, 37.806800 ], [ -122.234230, 37.804630 ], [ -122.228394, 37.800832 ], [ -122.216377, 37.798120 ], [ -122.209854, 37.796221 ], [ -122.204704, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.188911, 37.784283 ], [ -122.178268, 37.783469 ], [ -122.157326, 37.772614 ], [ -122.155266, 37.770443 ], [ -122.148056, 37.759587 ], [ -122.148056, 37.757959 ], [ -122.148399, 37.756601 ], [ -122.151833, 37.752801 ], [ -122.151489, 37.750087 ], [ -122.148743, 37.744929 ], [ -122.145653, 37.742214 ], [ -122.140503, 37.737055 ], [ -122.137756, 37.725108 ], [ -122.133293, 37.718590 ], [ -122.131233, 37.714245 ], [ -122.129173, 37.712344 ], [ -122.124367, 37.709628 ], [ -122.121620, 37.707455 ], [ -122.111664, 37.702294 ], [ -122.108231, 37.699578 ], [ -122.105827, 37.696861 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241440, 37.807343 ], [ -122.237320, 37.805715 ] ] } }
|
||||
,
|
||||
@@ -132,7 +132,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 9, "x": 82, "y": 197 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "macarthur", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.121449, 37.707726 ], [ -122.124882, 37.710307 ], [ -122.128315, 37.712072 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715060 ], [ -122.133121, 37.718590 ], [ -122.137241, 37.724836 ], [ -122.138271, 37.729724 ], [ -122.140503, 37.737327 ], [ -122.141190, 37.738277 ], [ -122.143764, 37.740313 ], [ -122.145481, 37.742621 ], [ -122.148743, 37.745200 ], [ -122.151318, 37.750222 ], [ -122.151661, 37.751580 ], [ -122.151489, 37.752801 ], [ -122.150803, 37.754158 ], [ -122.148399, 37.756466 ], [ -122.147713, 37.757823 ], [ -122.147713, 37.759587 ], [ -122.148743, 37.761623 ], [ -122.152519, 37.766644 ], [ -122.154579, 37.770172 ], [ -122.155437, 37.771258 ], [ -122.157326, 37.772886 ], [ -122.163849, 37.776414 ], [ -122.169514, 37.778856 ], [ -122.173977, 37.781298 ], [ -122.177582, 37.783604 ], [ -122.179642, 37.784011 ], [ -122.187881, 37.784283 ], [ -122.192173, 37.785232 ], [ -122.194405, 37.786046 ], [ -122.199726, 37.788895 ], [ -122.205048, 37.793915 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797441 ], [ -122.228909, 37.801104 ], [ -122.230110, 37.801782 ], [ -122.234230, 37.804901 ], [ -122.236462, 37.806122 ], [ -122.241955, 37.808563 ], [ -122.248821, 37.810598 ], [ -122.249508, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251396, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.258778, 37.821989 ], [ -122.260838, 37.822667 ], [ -122.281437, 37.827548 ], [ -122.283669, 37.827548 ], [ -122.287445, 37.826735 ], [ -122.289677, 37.827006 ], [ -122.291393, 37.827548 ], [ -122.292767, 37.828362 ], [ -122.293453, 37.829853 ], [ -122.293282, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.121449, 37.707726 ], [ -122.124882, 37.710307 ], [ -122.128315, 37.712072 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715060 ], [ -122.133121, 37.718590 ], [ -122.137241, 37.724836 ], [ -122.138271, 37.729724 ], [ -122.140503, 37.737327 ], [ -122.141190, 37.738277 ], [ -122.143764, 37.740313 ], [ -122.145481, 37.742621 ], [ -122.148743, 37.745200 ], [ -122.151318, 37.750222 ], [ -122.151661, 37.751580 ], [ -122.151489, 37.752801 ], [ -122.150803, 37.754158 ], [ -122.149086, 37.755651 ], [ -122.148056, 37.757144 ], [ -122.147713, 37.758501 ], [ -122.147713, 37.759587 ], [ -122.148743, 37.761623 ], [ -122.152519, 37.766644 ], [ -122.154579, 37.770172 ], [ -122.155437, 37.771258 ], [ -122.157326, 37.772886 ], [ -122.163849, 37.776414 ], [ -122.169514, 37.778856 ], [ -122.173977, 37.781298 ], [ -122.177582, 37.783604 ], [ -122.179642, 37.784011 ], [ -122.187881, 37.784283 ], [ -122.192173, 37.785232 ], [ -122.194405, 37.786046 ], [ -122.199726, 37.788895 ], [ -122.205048, 37.793915 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797441 ], [ -122.228909, 37.801104 ], [ -122.230110, 37.801782 ], [ -122.234230, 37.804901 ], [ -122.236462, 37.806122 ], [ -122.241955, 37.808563 ], [ -122.248821, 37.810598 ], [ -122.249508, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251396, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.258778, 37.821989 ], [ -122.260838, 37.822667 ], [ -122.281437, 37.827548 ], [ -122.283669, 37.827548 ], [ -122.287445, 37.826735 ], [ -122.289677, 37.827006 ], [ -122.291393, 37.827548 ], [ -122.292767, 37.828362 ], [ -122.293453, 37.829853 ], [ -122.293282, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254658, 37.821446 ], [ -122.255173, 37.822124 ], [ -122.257404, 37.823752 ], [ -122.259293, 37.824565 ], [ -122.263584, 37.825650 ], [ -122.265816, 37.826599 ], [ -122.271652, 37.827548 ] ] } }
|
||||
,
|
||||
@@ -140,7 +140,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817107 ], [ -122.252254, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294483, 37.832972 ], [ -122.293968, 37.831751 ], [ -122.293625, 37.828497 ], [ -122.292938, 37.827955 ], [ -122.291222, 37.827006 ], [ -122.289677, 37.826328 ], [ -122.287960, 37.826328 ], [ -122.282810, 37.827277 ], [ -122.280922, 37.827141 ], [ -122.268391, 37.824158 ], [ -122.261868, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.254143, 37.819141 ], [ -122.252769, 37.817921 ], [ -122.251568, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810733 ], [ -122.248650, 37.810326 ], [ -122.242470, 37.808428 ], [ -122.238522, 37.806936 ], [ -122.234230, 37.804766 ], [ -122.230282, 37.801646 ], [ -122.228394, 37.800697 ], [ -122.216377, 37.798120 ], [ -122.210026, 37.796221 ], [ -122.204876, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.190113, 37.784418 ], [ -122.188396, 37.784147 ], [ -122.179470, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.170029, 37.778992 ], [ -122.163162, 37.775871 ], [ -122.157497, 37.772750 ], [ -122.155952, 37.771529 ], [ -122.154408, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.148914, 37.761487 ], [ -122.147884, 37.759451 ], [ -122.147884, 37.757959 ], [ -122.148571, 37.756601 ], [ -122.150974, 37.754294 ], [ -122.151833, 37.752801 ], [ -122.151833, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149601, 37.746150 ], [ -122.148743, 37.744929 ], [ -122.145481, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141018, 37.737598 ], [ -122.140503, 37.736919 ], [ -122.138443, 37.729453 ], [ -122.137585, 37.724972 ], [ -122.137070, 37.723886 ], [ -122.134323, 37.720220 ], [ -122.133293, 37.718590 ], [ -122.131577, 37.714924 ], [ -122.130032, 37.713023 ], [ -122.128143, 37.711665 ], [ -122.124367, 37.709628 ], [ -122.121792, 37.707726 ] ] } }
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294483, 37.832972 ], [ -122.293968, 37.831751 ], [ -122.293625, 37.828497 ], [ -122.292938, 37.827955 ], [ -122.291222, 37.827006 ], [ -122.289677, 37.826328 ], [ -122.287960, 37.826328 ], [ -122.282810, 37.827277 ], [ -122.280922, 37.827141 ], [ -122.268391, 37.824158 ], [ -122.261868, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.254143, 37.819141 ], [ -122.252769, 37.817921 ], [ -122.251568, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810733 ], [ -122.248650, 37.810326 ], [ -122.242470, 37.808428 ], [ -122.238522, 37.806936 ], [ -122.234230, 37.804766 ], [ -122.230282, 37.801646 ], [ -122.228394, 37.800697 ], [ -122.216377, 37.798120 ], [ -122.210026, 37.796221 ], [ -122.204876, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.190113, 37.784418 ], [ -122.188396, 37.784147 ], [ -122.179470, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.170029, 37.778992 ], [ -122.163162, 37.775871 ], [ -122.157497, 37.772750 ], [ -122.155609, 37.771122 ], [ -122.154408, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.148914, 37.761487 ], [ -122.147884, 37.759451 ], [ -122.147884, 37.757959 ], [ -122.148571, 37.756601 ], [ -122.150974, 37.754294 ], [ -122.151833, 37.752801 ], [ -122.151833, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149601, 37.746150 ], [ -122.148743, 37.744929 ], [ -122.145481, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141018, 37.737598 ], [ -122.140503, 37.736919 ], [ -122.138443, 37.729453 ], [ -122.137585, 37.724972 ], [ -122.137070, 37.723886 ], [ -122.134323, 37.720220 ], [ -122.133293, 37.718590 ], [ -122.131577, 37.714924 ], [ -122.130032, 37.713023 ], [ -122.128143, 37.711665 ], [ -122.124367, 37.709628 ], [ -122.121792, 37.707726 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241440, 37.807207 ], [ -122.240925, 37.806800 ], [ -122.239380, 37.806665 ], [ -122.238350, 37.805986 ], [ -122.237148, 37.805580 ] ] } }
|
||||
,
|
||||
@@ -162,7 +162,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.158871, 37.749951 ], [ -122.157669, 37.748186 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.142906, 37.738141 ], [ -122.151318, 37.742214 ], [ -122.153378, 37.743978 ], [ -122.156296, 37.746015 ], [ -122.157154, 37.747372 ] ] } }
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -122.142906, 37.738141 ], [ -122.151318, 37.742214 ], [ -122.154751, 37.745064 ], [ -122.156296, 37.746015 ], [ -122.157154, 37.747372 ] ] } }
|
||||
] }
|
||||
] }
|
||||
] }
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 8, "x": 41, "y": 98 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "macarthur", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.105484, 37.696861 ], [ -122.109261, 37.700936 ], [ -122.116814, 37.705553 ], [ -122.120934, 37.707183 ], [ -122.124710, 37.710171 ], [ -122.128830, 37.712615 ], [ -122.131233, 37.714788 ], [ -122.133293, 37.718590 ], [ -122.137413, 37.724836 ], [ -122.140503, 37.737327 ], [ -122.143936, 37.740313 ], [ -122.145653, 37.742757 ], [ -122.148743, 37.745472 ], [ -122.151489, 37.750087 ], [ -122.151489, 37.752801 ], [ -122.148056, 37.756873 ], [ -122.147713, 37.759587 ], [ -122.155266, 37.770986 ], [ -122.157326, 37.772886 ], [ -122.169342, 37.778856 ], [ -122.177582, 37.783469 ], [ -122.179642, 37.784011 ], [ -122.188568, 37.784283 ], [ -122.194061, 37.785911 ], [ -122.199898, 37.788895 ], [ -122.205048, 37.794050 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797306 ], [ -122.228394, 37.800832 ], [ -122.236633, 37.806258 ], [ -122.241783, 37.808428 ], [ -122.248306, 37.810326 ], [ -122.250023, 37.811683 ], [ -122.251396, 37.816565 ], [ -122.252769, 37.818192 ], [ -122.255859, 37.820633 ], [ -122.258949, 37.821989 ], [ -122.281609, 37.827413 ], [ -122.284012, 37.827413 ], [ -122.287445, 37.826599 ], [ -122.289848, 37.826870 ], [ -122.292938, 37.828497 ], [ -122.293282, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.105484, 37.696861 ], [ -122.109261, 37.700936 ], [ -122.116814, 37.705553 ], [ -122.120934, 37.707183 ], [ -122.124710, 37.710171 ], [ -122.128830, 37.712615 ], [ -122.131233, 37.714788 ], [ -122.133293, 37.718590 ], [ -122.137413, 37.724836 ], [ -122.140503, 37.737327 ], [ -122.143936, 37.740313 ], [ -122.145653, 37.742757 ], [ -122.148743, 37.745472 ], [ -122.151489, 37.750087 ], [ -122.151489, 37.752801 ], [ -122.148056, 37.756873 ], [ -122.147713, 37.759587 ], [ -122.155266, 37.770986 ], [ -122.157326, 37.772886 ], [ -122.169342, 37.778856 ], [ -122.177582, 37.783469 ], [ -122.179642, 37.784011 ], [ -122.188568, 37.784283 ], [ -122.194061, 37.785911 ], [ -122.199898, 37.788895 ], [ -122.205048, 37.794050 ], [ -122.209511, 37.796221 ], [ -122.216721, 37.798391 ], [ -122.228394, 37.800832 ], [ -122.236633, 37.806258 ], [ -122.241783, 37.808428 ], [ -122.248306, 37.810326 ], [ -122.250023, 37.811683 ], [ -122.251396, 37.816565 ], [ -122.252769, 37.818192 ], [ -122.255859, 37.820633 ], [ -122.258949, 37.821989 ], [ -122.281609, 37.827413 ], [ -122.284012, 37.827413 ], [ -122.287445, 37.826599 ], [ -122.289848, 37.826870 ], [ -122.292938, 37.828497 ], [ -122.293282, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486392881", "FULLNAME": "W Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254829, 37.821446 ], [ -122.256889, 37.823345 ], [ -122.259293, 37.824701 ], [ -122.265816, 37.826599 ], [ -122.271652, 37.827413 ] ] } }
|
||||
,
|
||||
@@ -96,7 +96,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102654602215", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817107 ], [ -122.252426, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294655, 37.833107 ], [ -122.293625, 37.828497 ], [ -122.290878, 37.826870 ], [ -122.287788, 37.826328 ], [ -122.283325, 37.827141 ], [ -122.280922, 37.827141 ], [ -122.258949, 37.821718 ], [ -122.254143, 37.819277 ], [ -122.252769, 37.817921 ], [ -122.251740, 37.816022 ], [ -122.250366, 37.811954 ], [ -122.248650, 37.810326 ], [ -122.238693, 37.806800 ], [ -122.234230, 37.804630 ], [ -122.228394, 37.800832 ], [ -122.216377, 37.798120 ], [ -122.209854, 37.796221 ], [ -122.204704, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.188911, 37.784283 ], [ -122.178268, 37.783469 ], [ -122.157326, 37.772614 ], [ -122.155266, 37.770443 ], [ -122.148056, 37.759587 ], [ -122.148056, 37.757959 ], [ -122.148399, 37.756601 ], [ -122.151833, 37.752801 ], [ -122.151489, 37.750087 ], [ -122.148743, 37.744929 ], [ -122.145653, 37.742214 ], [ -122.143936, 37.740042 ], [ -122.140503, 37.737055 ], [ -122.137756, 37.725108 ], [ -122.133293, 37.718590 ], [ -122.131233, 37.714245 ], [ -122.129173, 37.712344 ], [ -122.124367, 37.709628 ], [ -122.121620, 37.707455 ], [ -122.111664, 37.702294 ], [ -122.108231, 37.699578 ], [ -122.105827, 37.696861 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294655, 37.833107 ], [ -122.293625, 37.828497 ], [ -122.290878, 37.826870 ], [ -122.287788, 37.826328 ], [ -122.283325, 37.827141 ], [ -122.280922, 37.827141 ], [ -122.258949, 37.821718 ], [ -122.254143, 37.819277 ], [ -122.252769, 37.817921 ], [ -122.251740, 37.816022 ], [ -122.250366, 37.811954 ], [ -122.248650, 37.810326 ], [ -122.238693, 37.806800 ], [ -122.234230, 37.804630 ], [ -122.228394, 37.800832 ], [ -122.216377, 37.798120 ], [ -122.209854, 37.796221 ], [ -122.204704, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.188911, 37.784283 ], [ -122.178268, 37.783469 ], [ -122.157326, 37.772614 ], [ -122.155266, 37.770443 ], [ -122.148056, 37.759587 ], [ -122.148056, 37.757959 ], [ -122.148399, 37.756601 ], [ -122.151833, 37.752801 ], [ -122.151489, 37.750087 ], [ -122.148743, 37.744929 ], [ -122.145653, 37.742214 ], [ -122.140503, 37.737055 ], [ -122.137756, 37.725108 ], [ -122.133293, 37.718590 ], [ -122.131233, 37.714245 ], [ -122.129173, 37.712344 ], [ -122.124367, 37.709628 ], [ -122.121620, 37.707455 ], [ -122.111664, 37.702294 ], [ -122.108231, 37.699578 ], [ -122.105827, 37.696861 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241440, 37.807343 ], [ -122.237320, 37.805715 ] ] } }
|
||||
,
|
||||
@@ -132,7 +132,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 9, "x": 82, "y": 197 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "macarthur", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.121449, 37.707726 ], [ -122.124882, 37.710307 ], [ -122.128315, 37.712072 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715060 ], [ -122.133121, 37.718590 ], [ -122.137241, 37.724836 ], [ -122.138271, 37.729724 ], [ -122.140503, 37.737327 ], [ -122.141190, 37.738277 ], [ -122.143764, 37.740313 ], [ -122.145481, 37.742621 ], [ -122.148743, 37.745200 ], [ -122.151318, 37.750222 ], [ -122.151661, 37.751580 ], [ -122.151489, 37.752801 ], [ -122.150803, 37.754158 ], [ -122.148399, 37.756466 ], [ -122.147713, 37.757823 ], [ -122.147713, 37.759587 ], [ -122.148743, 37.761623 ], [ -122.152519, 37.766644 ], [ -122.154579, 37.770172 ], [ -122.155437, 37.771258 ], [ -122.157326, 37.772886 ], [ -122.163849, 37.776414 ], [ -122.169514, 37.778856 ], [ -122.173977, 37.781298 ], [ -122.177582, 37.783604 ], [ -122.179642, 37.784011 ], [ -122.187881, 37.784283 ], [ -122.192173, 37.785232 ], [ -122.194405, 37.786046 ], [ -122.199726, 37.788895 ], [ -122.205048, 37.793915 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797441 ], [ -122.228909, 37.801104 ], [ -122.230110, 37.801782 ], [ -122.234230, 37.804901 ], [ -122.236462, 37.806122 ], [ -122.241955, 37.808563 ], [ -122.248821, 37.810598 ], [ -122.249508, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251396, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.258778, 37.821989 ], [ -122.260838, 37.822667 ], [ -122.281437, 37.827548 ], [ -122.283669, 37.827548 ], [ -122.287445, 37.826735 ], [ -122.289677, 37.827006 ], [ -122.291393, 37.827548 ], [ -122.292767, 37.828362 ], [ -122.293453, 37.829853 ], [ -122.293282, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.121449, 37.707726 ], [ -122.124882, 37.710307 ], [ -122.128315, 37.712072 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715060 ], [ -122.133121, 37.718590 ], [ -122.137241, 37.724836 ], [ -122.138271, 37.729724 ], [ -122.140503, 37.737327 ], [ -122.141190, 37.738277 ], [ -122.143764, 37.740313 ], [ -122.145481, 37.742621 ], [ -122.148743, 37.745200 ], [ -122.151318, 37.750222 ], [ -122.151661, 37.751580 ], [ -122.151489, 37.752801 ], [ -122.150803, 37.754158 ], [ -122.149086, 37.755651 ], [ -122.148056, 37.757144 ], [ -122.147713, 37.758501 ], [ -122.147713, 37.759587 ], [ -122.148743, 37.761623 ], [ -122.152519, 37.766644 ], [ -122.154579, 37.770172 ], [ -122.155437, 37.771258 ], [ -122.157326, 37.772886 ], [ -122.163849, 37.776414 ], [ -122.169514, 37.778856 ], [ -122.173977, 37.781298 ], [ -122.177582, 37.783604 ], [ -122.179642, 37.784011 ], [ -122.187881, 37.784283 ], [ -122.192173, 37.785232 ], [ -122.194405, 37.786046 ], [ -122.199726, 37.788895 ], [ -122.205048, 37.793915 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797441 ], [ -122.228909, 37.801104 ], [ -122.230110, 37.801782 ], [ -122.234230, 37.804901 ], [ -122.236462, 37.806122 ], [ -122.241955, 37.808563 ], [ -122.248821, 37.810598 ], [ -122.249508, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251396, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.258778, 37.821989 ], [ -122.260838, 37.822667 ], [ -122.281437, 37.827548 ], [ -122.283669, 37.827548 ], [ -122.287445, 37.826735 ], [ -122.289677, 37.827006 ], [ -122.291393, 37.827548 ], [ -122.292767, 37.828362 ], [ -122.293453, 37.829853 ], [ -122.293282, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486392881", "FULLNAME": "W Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254658, 37.821446 ], [ -122.255173, 37.822124 ], [ -122.257404, 37.823752 ], [ -122.259293, 37.824565 ], [ -122.263584, 37.825650 ], [ -122.265816, 37.826599 ], [ -122.271652, 37.827548 ] ] } }
|
||||
,
|
||||
@@ -140,7 +140,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102654602215", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817107 ], [ -122.252254, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294483, 37.832972 ], [ -122.293968, 37.831751 ], [ -122.293625, 37.828497 ], [ -122.292938, 37.827955 ], [ -122.291222, 37.827006 ], [ -122.289677, 37.826328 ], [ -122.287960, 37.826328 ], [ -122.282810, 37.827277 ], [ -122.280922, 37.827141 ], [ -122.268391, 37.824158 ], [ -122.261868, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.254143, 37.819141 ], [ -122.252769, 37.817921 ], [ -122.251568, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810733 ], [ -122.248650, 37.810326 ], [ -122.242470, 37.808428 ], [ -122.238522, 37.806936 ], [ -122.234230, 37.804766 ], [ -122.230282, 37.801646 ], [ -122.228394, 37.800697 ], [ -122.216377, 37.798120 ], [ -122.210026, 37.796221 ], [ -122.204876, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.190113, 37.784418 ], [ -122.188396, 37.784147 ], [ -122.179470, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.170029, 37.778992 ], [ -122.163162, 37.775871 ], [ -122.157497, 37.772750 ], [ -122.155952, 37.771529 ], [ -122.154408, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.148914, 37.761487 ], [ -122.147884, 37.759451 ], [ -122.147884, 37.757959 ], [ -122.148571, 37.756601 ], [ -122.150974, 37.754294 ], [ -122.151833, 37.752801 ], [ -122.151833, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149601, 37.746150 ], [ -122.148743, 37.744929 ], [ -122.145481, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141018, 37.737598 ], [ -122.140503, 37.736919 ], [ -122.138443, 37.729453 ], [ -122.137585, 37.724972 ], [ -122.137070, 37.723886 ], [ -122.134323, 37.720220 ], [ -122.133293, 37.718590 ], [ -122.131577, 37.714924 ], [ -122.130032, 37.713023 ], [ -122.128143, 37.711665 ], [ -122.124367, 37.709628 ], [ -122.121792, 37.707726 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294483, 37.832972 ], [ -122.293968, 37.831751 ], [ -122.293625, 37.828497 ], [ -122.292938, 37.827955 ], [ -122.291222, 37.827006 ], [ -122.289677, 37.826328 ], [ -122.287960, 37.826328 ], [ -122.282810, 37.827277 ], [ -122.280922, 37.827141 ], [ -122.268391, 37.824158 ], [ -122.261868, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.254143, 37.819141 ], [ -122.252769, 37.817921 ], [ -122.251568, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810733 ], [ -122.248650, 37.810326 ], [ -122.242470, 37.808428 ], [ -122.238522, 37.806936 ], [ -122.234230, 37.804766 ], [ -122.230282, 37.801646 ], [ -122.228394, 37.800697 ], [ -122.216377, 37.798120 ], [ -122.210026, 37.796221 ], [ -122.204876, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.190113, 37.784418 ], [ -122.188396, 37.784147 ], [ -122.179470, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.170029, 37.778992 ], [ -122.163162, 37.775871 ], [ -122.157497, 37.772750 ], [ -122.155609, 37.771122 ], [ -122.154408, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.148914, 37.761487 ], [ -122.147884, 37.759451 ], [ -122.147884, 37.757959 ], [ -122.148571, 37.756601 ], [ -122.150974, 37.754294 ], [ -122.151833, 37.752801 ], [ -122.151833, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149601, 37.746150 ], [ -122.148743, 37.744929 ], [ -122.145481, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141018, 37.737598 ], [ -122.140503, 37.736919 ], [ -122.138443, 37.729453 ], [ -122.137585, 37.724972 ], [ -122.137070, 37.723886 ], [ -122.134323, 37.720220 ], [ -122.133293, 37.718590 ], [ -122.131577, 37.714924 ], [ -122.130032, 37.713023 ], [ -122.128143, 37.711665 ], [ -122.124367, 37.709628 ], [ -122.121792, 37.707726 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241440, 37.807207 ], [ -122.240925, 37.806800 ], [ -122.239380, 37.806665 ], [ -122.238350, 37.805986 ], [ -122.237148, 37.805580 ] ] } }
|
||||
,
|
||||
@@ -162,7 +162,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690474249", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.158871, 37.749951 ], [ -122.157669, 37.748186 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690474250", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.142906, 37.738141 ], [ -122.151318, 37.742214 ], [ -122.153378, 37.743978 ], [ -122.156296, 37.746015 ], [ -122.157154, 37.747372 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690474250", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.142906, 37.738141 ], [ -122.151318, 37.742214 ], [ -122.154751, 37.745064 ], [ -122.156296, 37.746015 ], [ -122.157154, 37.747372 ] ] } }
|
||||
] }
|
||||
] }
|
||||
] }
|
||||
|
||||
File diff suppressed because one or more lines are too long
+1305
-1305
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -134,7 +134,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103717593123", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.228394, 37.801104 ], [ -122.206421, 37.797848 ], [ -122.192688, 37.785911 ], [ -122.187195, 37.784825 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.228394, 37.801104 ], [ -122.207794, 37.797848 ], [ -122.192688, 37.785911 ], [ -122.188568, 37.783740 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.228394, 37.801104 ], [ -122.206421, 37.797848 ], [ -122.192688, 37.785911 ], [ -122.188568, 37.783740 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275688", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.194061, 37.785911 ], [ -122.188568, 37.783740 ] ] } }
|
||||
,
|
||||
@@ -212,7 +212,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103717593123", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227707, 37.801104 ], [ -122.220154, 37.800019 ], [ -122.218094, 37.801104 ], [ -122.207108, 37.798391 ], [ -122.200928, 37.794593 ], [ -122.193375, 37.785911 ], [ -122.187881, 37.784283 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227707, 37.801104 ], [ -122.220154, 37.800019 ], [ -122.218094, 37.800561 ], [ -122.207108, 37.798391 ], [ -122.202301, 37.795135 ], [ -122.193375, 37.785911 ], [ -122.188568, 37.783740 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227707, 37.801104 ], [ -122.220154, 37.800019 ], [ -122.218094, 37.800561 ], [ -122.206421, 37.798391 ], [ -122.200928, 37.794050 ], [ -122.193375, 37.785911 ], [ -122.188568, 37.783740 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275688", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.194061, 37.786453 ], [ -122.188568, 37.783740 ] ] } }
|
||||
,
|
||||
@@ -260,7 +260,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 8, "x": 41, "y": 98 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "one", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.105484, 37.696861 ], [ -122.109261, 37.700936 ], [ -122.116814, 37.705553 ], [ -122.120934, 37.707183 ], [ -122.124710, 37.710171 ], [ -122.128830, 37.712615 ], [ -122.131233, 37.714788 ], [ -122.133293, 37.718590 ], [ -122.137413, 37.724836 ], [ -122.140503, 37.737327 ], [ -122.143936, 37.740313 ], [ -122.145653, 37.742757 ], [ -122.148743, 37.745472 ], [ -122.151489, 37.750087 ], [ -122.151489, 37.752801 ], [ -122.148056, 37.756873 ], [ -122.147713, 37.759587 ], [ -122.155266, 37.770986 ], [ -122.157326, 37.772886 ], [ -122.169342, 37.778856 ], [ -122.177582, 37.783469 ], [ -122.179642, 37.784011 ], [ -122.188568, 37.784283 ], [ -122.194061, 37.785911 ], [ -122.199898, 37.788895 ], [ -122.205048, 37.794050 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797306 ], [ -122.228394, 37.800832 ], [ -122.236633, 37.806258 ], [ -122.241783, 37.808428 ], [ -122.248306, 37.810326 ], [ -122.250023, 37.811683 ], [ -122.251396, 37.816565 ], [ -122.252769, 37.818192 ], [ -122.255859, 37.820633 ], [ -122.258949, 37.821989 ], [ -122.281609, 37.827413 ], [ -122.284012, 37.827413 ], [ -122.287445, 37.826599 ], [ -122.289848, 37.826870 ], [ -122.292938, 37.828497 ], [ -122.293282, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.105484, 37.696861 ], [ -122.109261, 37.700936 ], [ -122.116814, 37.705553 ], [ -122.120934, 37.707183 ], [ -122.124710, 37.710171 ], [ -122.128830, 37.712615 ], [ -122.131233, 37.714788 ], [ -122.133293, 37.718590 ], [ -122.137413, 37.724836 ], [ -122.140503, 37.737327 ], [ -122.143936, 37.740313 ], [ -122.145653, 37.742757 ], [ -122.148743, 37.745472 ], [ -122.151489, 37.750087 ], [ -122.151489, 37.752801 ], [ -122.148056, 37.756873 ], [ -122.147713, 37.759587 ], [ -122.155266, 37.770986 ], [ -122.157326, 37.772886 ], [ -122.169342, 37.778856 ], [ -122.177582, 37.783469 ], [ -122.179642, 37.784011 ], [ -122.188568, 37.784283 ], [ -122.194061, 37.785911 ], [ -122.199898, 37.788895 ], [ -122.205048, 37.794050 ], [ -122.209511, 37.796221 ], [ -122.216721, 37.798391 ], [ -122.228394, 37.800832 ], [ -122.236633, 37.806258 ], [ -122.241783, 37.808428 ], [ -122.248306, 37.810326 ], [ -122.250023, 37.811683 ], [ -122.251396, 37.816565 ], [ -122.252769, 37.818192 ], [ -122.255859, 37.820633 ], [ -122.258949, 37.821989 ], [ -122.281609, 37.827413 ], [ -122.284012, 37.827413 ], [ -122.287445, 37.826599 ], [ -122.289848, 37.826870 ], [ -122.292938, 37.828497 ], [ -122.293282, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486392881", "FULLNAME": "W Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254829, 37.821446 ], [ -122.256889, 37.823345 ], [ -122.259293, 37.824701 ], [ -122.265816, 37.826599 ], [ -122.271652, 37.827413 ] ] } }
|
||||
,
|
||||
@@ -268,7 +268,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102654602215", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817107 ], [ -122.252426, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294655, 37.833107 ], [ -122.293625, 37.828497 ], [ -122.290878, 37.826870 ], [ -122.287788, 37.826328 ], [ -122.283325, 37.827141 ], [ -122.280922, 37.827141 ], [ -122.258949, 37.821718 ], [ -122.254143, 37.819277 ], [ -122.252769, 37.817921 ], [ -122.251740, 37.816022 ], [ -122.250366, 37.811954 ], [ -122.248650, 37.810326 ], [ -122.238693, 37.806800 ], [ -122.234230, 37.804630 ], [ -122.228394, 37.800832 ], [ -122.216377, 37.798120 ], [ -122.209854, 37.796221 ], [ -122.204704, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.188911, 37.784283 ], [ -122.178268, 37.783469 ], [ -122.157326, 37.772614 ], [ -122.155266, 37.770443 ], [ -122.148056, 37.759587 ], [ -122.148056, 37.757959 ], [ -122.148399, 37.756601 ], [ -122.151833, 37.752801 ], [ -122.151489, 37.750087 ], [ -122.148743, 37.744929 ], [ -122.145653, 37.742214 ], [ -122.143936, 37.740042 ], [ -122.140503, 37.737055 ], [ -122.137756, 37.725108 ], [ -122.133293, 37.718590 ], [ -122.131233, 37.714245 ], [ -122.129173, 37.712344 ], [ -122.124367, 37.709628 ], [ -122.121620, 37.707455 ], [ -122.111664, 37.702294 ], [ -122.108231, 37.699578 ], [ -122.105827, 37.696861 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294655, 37.833107 ], [ -122.293625, 37.828497 ], [ -122.290878, 37.826870 ], [ -122.287788, 37.826328 ], [ -122.283325, 37.827141 ], [ -122.280922, 37.827141 ], [ -122.258949, 37.821718 ], [ -122.254143, 37.819277 ], [ -122.252769, 37.817921 ], [ -122.251740, 37.816022 ], [ -122.250366, 37.811954 ], [ -122.248650, 37.810326 ], [ -122.238693, 37.806800 ], [ -122.234230, 37.804630 ], [ -122.228394, 37.800832 ], [ -122.216377, 37.798120 ], [ -122.209854, 37.796221 ], [ -122.204704, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.188911, 37.784283 ], [ -122.178268, 37.783469 ], [ -122.157326, 37.772614 ], [ -122.155266, 37.770443 ], [ -122.148056, 37.759587 ], [ -122.148056, 37.757959 ], [ -122.148399, 37.756601 ], [ -122.151833, 37.752801 ], [ -122.151489, 37.750087 ], [ -122.148743, 37.744929 ], [ -122.145653, 37.742214 ], [ -122.140503, 37.737055 ], [ -122.137756, 37.725108 ], [ -122.133293, 37.718590 ], [ -122.131233, 37.714245 ], [ -122.129173, 37.712344 ], [ -122.124367, 37.709628 ], [ -122.121620, 37.707455 ], [ -122.111664, 37.702294 ], [ -122.108231, 37.699578 ], [ -122.105827, 37.696861 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241440, 37.807343 ], [ -122.237320, 37.805715 ] ] } }
|
||||
,
|
||||
@@ -320,7 +320,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103717593123", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227707, 37.801375 ], [ -122.220497, 37.800019 ], [ -122.218781, 37.801104 ], [ -122.208824, 37.798391 ], [ -122.207451, 37.798662 ], [ -122.204704, 37.797306 ], [ -122.201271, 37.794322 ], [ -122.193375, 37.785911 ], [ -122.187538, 37.784554 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227707, 37.801375 ], [ -122.220497, 37.800019 ], [ -122.219810, 37.800019 ], [ -122.218437, 37.800832 ], [ -122.209511, 37.798662 ], [ -122.207108, 37.798391 ], [ -122.205048, 37.797306 ], [ -122.201958, 37.795135 ], [ -122.193375, 37.785911 ], [ -122.188568, 37.784554 ], [ -122.188225, 37.783740 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227707, 37.801375 ], [ -122.220497, 37.800019 ], [ -122.219810, 37.800019 ], [ -122.218437, 37.800832 ], [ -122.206764, 37.798120 ], [ -122.205048, 37.797306 ], [ -122.201958, 37.795135 ], [ -122.193375, 37.785911 ], [ -122.188568, 37.784554 ], [ -122.188225, 37.783740 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275688", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.194061, 37.786182 ], [ -122.192001, 37.784554 ], [ -122.188911, 37.783740 ] ] } }
|
||||
,
|
||||
@@ -362,7 +362,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 9, "x": 82, "y": 197 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "one", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.121449, 37.707726 ], [ -122.124882, 37.710307 ], [ -122.128315, 37.712072 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715060 ], [ -122.133121, 37.718590 ], [ -122.137241, 37.724836 ], [ -122.138271, 37.729724 ], [ -122.140503, 37.737327 ], [ -122.141190, 37.738277 ], [ -122.143764, 37.740313 ], [ -122.145481, 37.742621 ], [ -122.148743, 37.745200 ], [ -122.151318, 37.750222 ], [ -122.151661, 37.751580 ], [ -122.151489, 37.752801 ], [ -122.150803, 37.754158 ], [ -122.148399, 37.756466 ], [ -122.147713, 37.757823 ], [ -122.147713, 37.759587 ], [ -122.148743, 37.761623 ], [ -122.152519, 37.766644 ], [ -122.154579, 37.770172 ], [ -122.155437, 37.771258 ], [ -122.157326, 37.772886 ], [ -122.163849, 37.776414 ], [ -122.169514, 37.778856 ], [ -122.173977, 37.781298 ], [ -122.177582, 37.783604 ], [ -122.179642, 37.784011 ], [ -122.187881, 37.784283 ], [ -122.192173, 37.785232 ], [ -122.194405, 37.786046 ], [ -122.199726, 37.788895 ], [ -122.205048, 37.793915 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797441 ], [ -122.228909, 37.801104 ], [ -122.230110, 37.801782 ], [ -122.234230, 37.804901 ], [ -122.236462, 37.806122 ], [ -122.241955, 37.808563 ], [ -122.248821, 37.810598 ], [ -122.249508, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251396, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.258778, 37.821989 ], [ -122.260838, 37.822667 ], [ -122.281437, 37.827548 ], [ -122.283669, 37.827548 ], [ -122.287445, 37.826735 ], [ -122.289677, 37.827006 ], [ -122.291393, 37.827548 ], [ -122.292767, 37.828362 ], [ -122.293453, 37.829853 ], [ -122.293282, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.121449, 37.707726 ], [ -122.124882, 37.710307 ], [ -122.128315, 37.712072 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715060 ], [ -122.133121, 37.718590 ], [ -122.137241, 37.724836 ], [ -122.138271, 37.729724 ], [ -122.140503, 37.737327 ], [ -122.141190, 37.738277 ], [ -122.143764, 37.740313 ], [ -122.145481, 37.742621 ], [ -122.148743, 37.745200 ], [ -122.151318, 37.750222 ], [ -122.151661, 37.751580 ], [ -122.151489, 37.752801 ], [ -122.150803, 37.754158 ], [ -122.149086, 37.755651 ], [ -122.148056, 37.757144 ], [ -122.147713, 37.758501 ], [ -122.147713, 37.759587 ], [ -122.148743, 37.761623 ], [ -122.152519, 37.766644 ], [ -122.154579, 37.770172 ], [ -122.155437, 37.771258 ], [ -122.157326, 37.772886 ], [ -122.163849, 37.776414 ], [ -122.169514, 37.778856 ], [ -122.173977, 37.781298 ], [ -122.177582, 37.783604 ], [ -122.179642, 37.784011 ], [ -122.187881, 37.784283 ], [ -122.192173, 37.785232 ], [ -122.194405, 37.786046 ], [ -122.199726, 37.788895 ], [ -122.205048, 37.793915 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797441 ], [ -122.228909, 37.801104 ], [ -122.230110, 37.801782 ], [ -122.234230, 37.804901 ], [ -122.236462, 37.806122 ], [ -122.241955, 37.808563 ], [ -122.248821, 37.810598 ], [ -122.249508, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251396, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.258778, 37.821989 ], [ -122.260838, 37.822667 ], [ -122.281437, 37.827548 ], [ -122.283669, 37.827548 ], [ -122.287445, 37.826735 ], [ -122.289677, 37.827006 ], [ -122.291393, 37.827548 ], [ -122.292767, 37.828362 ], [ -122.293453, 37.829853 ], [ -122.293282, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486392881", "FULLNAME": "W Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254658, 37.821446 ], [ -122.255173, 37.822124 ], [ -122.257404, 37.823752 ], [ -122.259293, 37.824565 ], [ -122.263584, 37.825650 ], [ -122.265816, 37.826599 ], [ -122.271652, 37.827548 ] ] } }
|
||||
,
|
||||
@@ -370,7 +370,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102654602215", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817107 ], [ -122.252254, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294483, 37.832972 ], [ -122.293968, 37.831751 ], [ -122.293625, 37.828497 ], [ -122.292938, 37.827955 ], [ -122.291222, 37.827006 ], [ -122.289677, 37.826328 ], [ -122.287960, 37.826328 ], [ -122.282810, 37.827277 ], [ -122.280922, 37.827141 ], [ -122.268391, 37.824158 ], [ -122.261868, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.254143, 37.819141 ], [ -122.252769, 37.817921 ], [ -122.251568, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810733 ], [ -122.248650, 37.810326 ], [ -122.242470, 37.808428 ], [ -122.238522, 37.806936 ], [ -122.234230, 37.804766 ], [ -122.230282, 37.801646 ], [ -122.228394, 37.800697 ], [ -122.216377, 37.798120 ], [ -122.210026, 37.796221 ], [ -122.204876, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.190113, 37.784418 ], [ -122.188396, 37.784147 ], [ -122.179470, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.170029, 37.778992 ], [ -122.163162, 37.775871 ], [ -122.157497, 37.772750 ], [ -122.155952, 37.771529 ], [ -122.154408, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.148914, 37.761487 ], [ -122.147884, 37.759451 ], [ -122.147884, 37.757959 ], [ -122.148571, 37.756601 ], [ -122.150974, 37.754294 ], [ -122.151833, 37.752801 ], [ -122.151833, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149601, 37.746150 ], [ -122.148743, 37.744929 ], [ -122.145481, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141018, 37.737598 ], [ -122.140503, 37.736919 ], [ -122.138443, 37.729453 ], [ -122.137585, 37.724972 ], [ -122.137070, 37.723886 ], [ -122.134323, 37.720220 ], [ -122.133293, 37.718590 ], [ -122.131577, 37.714924 ], [ -122.130032, 37.713023 ], [ -122.128143, 37.711665 ], [ -122.124367, 37.709628 ], [ -122.121792, 37.707726 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294483, 37.832972 ], [ -122.293968, 37.831751 ], [ -122.293625, 37.828497 ], [ -122.292938, 37.827955 ], [ -122.291222, 37.827006 ], [ -122.289677, 37.826328 ], [ -122.287960, 37.826328 ], [ -122.282810, 37.827277 ], [ -122.280922, 37.827141 ], [ -122.268391, 37.824158 ], [ -122.261868, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.254143, 37.819141 ], [ -122.252769, 37.817921 ], [ -122.251568, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810733 ], [ -122.248650, 37.810326 ], [ -122.242470, 37.808428 ], [ -122.238522, 37.806936 ], [ -122.234230, 37.804766 ], [ -122.230282, 37.801646 ], [ -122.228394, 37.800697 ], [ -122.216377, 37.798120 ], [ -122.210026, 37.796221 ], [ -122.204876, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.190113, 37.784418 ], [ -122.188396, 37.784147 ], [ -122.179470, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.170029, 37.778992 ], [ -122.163162, 37.775871 ], [ -122.157497, 37.772750 ], [ -122.155609, 37.771122 ], [ -122.154408, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.148914, 37.761487 ], [ -122.147884, 37.759451 ], [ -122.147884, 37.757959 ], [ -122.148571, 37.756601 ], [ -122.150974, 37.754294 ], [ -122.151833, 37.752801 ], [ -122.151833, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149601, 37.746150 ], [ -122.148743, 37.744929 ], [ -122.145481, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141018, 37.737598 ], [ -122.140503, 37.736919 ], [ -122.138443, 37.729453 ], [ -122.137585, 37.724972 ], [ -122.137070, 37.723886 ], [ -122.134323, 37.720220 ], [ -122.133293, 37.718590 ], [ -122.131577, 37.714924 ], [ -122.130032, 37.713023 ], [ -122.128143, 37.711665 ], [ -122.124367, 37.709628 ], [ -122.121792, 37.707726 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241440, 37.807207 ], [ -122.240925, 37.806800 ], [ -122.239380, 37.806665 ], [ -122.238350, 37.805986 ], [ -122.237148, 37.805580 ] ] } }
|
||||
,
|
||||
@@ -392,7 +392,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690474249", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.158871, 37.749951 ], [ -122.157669, 37.748186 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690474250", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.142906, 37.738141 ], [ -122.151318, 37.742214 ], [ -122.153378, 37.743978 ], [ -122.156296, 37.746015 ], [ -122.157154, 37.747372 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103690474250", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.142906, 37.738141 ], [ -122.151318, 37.742214 ], [ -122.154751, 37.745064 ], [ -122.156296, 37.746015 ], [ -122.157154, 37.747372 ] ] } }
|
||||
] }
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "two", "version": 2, "extent": 4096 }, "features": [
|
||||
@@ -420,9 +420,9 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638078801", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.229080, 37.801646 ], [ -122.227707, 37.801375 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103717593123", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227707, 37.801375 ], [ -122.220325, 37.800019 ], [ -122.219810, 37.800154 ], [ -122.219296, 37.800832 ], [ -122.218609, 37.800968 ], [ -122.208824, 37.798527 ], [ -122.207623, 37.798662 ], [ -122.204704, 37.797306 ], [ -122.201099, 37.794322 ], [ -122.195263, 37.787946 ], [ -122.193031, 37.785775 ], [ -122.187538, 37.784554 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103717593123", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227707, 37.801375 ], [ -122.220325, 37.800019 ], [ -122.219810, 37.800154 ], [ -122.219124, 37.800968 ], [ -122.218609, 37.800968 ], [ -122.208824, 37.798527 ], [ -122.207623, 37.798662 ], [ -122.204704, 37.797306 ], [ -122.201099, 37.794322 ], [ -122.195263, 37.787946 ], [ -122.193031, 37.785775 ], [ -122.187538, 37.784554 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227707, 37.801375 ], [ -122.220669, 37.799883 ], [ -122.219810, 37.800019 ], [ -122.219124, 37.800832 ], [ -122.218609, 37.800968 ], [ -122.208824, 37.798391 ], [ -122.207623, 37.798527 ], [ -122.207108, 37.798391 ], [ -122.204876, 37.797306 ], [ -122.202129, 37.795135 ], [ -122.194920, 37.787267 ], [ -122.193375, 37.786046 ], [ -122.192688, 37.785639 ], [ -122.189255, 37.784825 ], [ -122.188568, 37.784554 ], [ -122.188225, 37.783740 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227707, 37.801375 ], [ -122.220669, 37.799883 ], [ -122.219810, 37.800019 ], [ -122.219124, 37.800832 ], [ -122.218609, 37.800968 ], [ -122.208824, 37.798391 ], [ -122.207623, 37.798527 ], [ -122.206764, 37.798120 ], [ -122.204876, 37.797306 ], [ -122.202129, 37.795135 ], [ -122.194920, 37.787267 ], [ -122.193375, 37.786046 ], [ -122.192688, 37.785639 ], [ -122.189255, 37.784825 ], [ -122.188568, 37.784554 ], [ -122.188225, 37.783740 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275688", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.194061, 37.786318 ], [ -122.193031, 37.785368 ], [ -122.192001, 37.784690 ], [ -122.188740, 37.783740 ] ] } }
|
||||
,
|
||||
@@ -464,7 +464,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 10, "x": 164, "y": 395 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "one", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.129774, 37.713159 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715128 ], [ -122.133121, 37.718590 ], [ -122.134151, 37.720356 ], [ -122.136984, 37.724157 ], [ -122.137327, 37.724836 ], [ -122.137842, 37.726873 ], [ -122.138357, 37.729792 ], [ -122.139387, 37.733186 ], [ -122.139988, 37.736105 ], [ -122.140503, 37.737327 ], [ -122.141275, 37.738277 ], [ -122.143164, 37.739702 ], [ -122.143850, 37.740381 ], [ -122.145567, 37.742689 ], [ -122.146339, 37.743368 ], [ -122.147713, 37.744250 ], [ -122.148743, 37.745200 ], [ -122.149343, 37.746082 ], [ -122.151403, 37.750222 ], [ -122.151747, 37.751580 ], [ -122.151575, 37.752869 ], [ -122.150888, 37.754158 ], [ -122.149172, 37.755651 ], [ -122.148228, 37.756805 ], [ -122.147799, 37.757823 ], [ -122.147799, 37.759587 ], [ -122.148056, 37.760401 ], [ -122.148829, 37.761691 ], [ -122.150202, 37.763794 ], [ -122.152519, 37.766712 ], [ -122.155180, 37.770918 ], [ -122.155952, 37.771732 ], [ -122.157412, 37.772954 ], [ -122.158356, 37.773564 ], [ -122.163935, 37.776414 ], [ -122.169514, 37.778924 ], [ -122.174063, 37.781366 ], [ -122.176123, 37.782655 ], [ -122.176380, 37.782926 ], [ -122.176552, 37.782926 ], [ -122.177668, 37.783604 ], [ -122.179728, 37.784079 ], [ -122.185822, 37.784215 ], [ -122.188654, 37.784418 ], [ -122.192173, 37.785232 ], [ -122.193975, 37.785911 ], [ -122.199812, 37.788895 ], [ -122.201700, 37.790523 ], [ -122.204103, 37.793168 ], [ -122.205133, 37.793982 ], [ -122.206593, 37.794796 ], [ -122.209597, 37.796221 ], [ -122.210970, 37.796831 ], [ -122.213030, 37.797441 ], [ -122.215261, 37.797916 ], [ -122.219038, 37.798933 ], [ -122.227278, 37.800629 ], [ -122.228909, 37.801104 ], [ -122.230196, 37.801850 ], [ -122.232771, 37.803952 ], [ -122.234230, 37.804969 ], [ -122.236547, 37.806190 ], [ -122.241011, 37.808224 ], [ -122.246418, 37.809784 ], [ -122.248821, 37.810598 ], [ -122.249594, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251482, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.255945, 37.820565 ], [ -122.258863, 37.821989 ], [ -122.260838, 37.822735 ], [ -122.268047, 37.824294 ], [ -122.274399, 37.825921 ], [ -122.281094, 37.827480 ], [ -122.282038, 37.827616 ], [ -122.283669, 37.827548 ], [ -122.286844, 37.826802 ], [ -122.287531, 37.826735 ], [ -122.288132, 37.826735 ], [ -122.289762, 37.827006 ], [ -122.291479, 37.827616 ], [ -122.292337, 37.828023 ], [ -122.292852, 37.828430 ], [ -122.293196, 37.828972 ], [ -122.293453, 37.829853 ], [ -122.293367, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104474748623", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.129774, 37.713159 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715128 ], [ -122.133121, 37.718590 ], [ -122.134151, 37.720356 ], [ -122.136984, 37.724157 ], [ -122.137327, 37.724836 ], [ -122.137842, 37.726873 ], [ -122.138357, 37.729792 ], [ -122.139387, 37.733186 ], [ -122.139988, 37.736105 ], [ -122.140503, 37.737327 ], [ -122.141275, 37.738277 ], [ -122.143164, 37.739702 ], [ -122.143850, 37.740381 ], [ -122.145567, 37.742689 ], [ -122.146339, 37.743368 ], [ -122.148142, 37.744589 ], [ -122.148743, 37.745200 ], [ -122.149343, 37.746082 ], [ -122.151403, 37.750222 ], [ -122.151747, 37.751580 ], [ -122.151575, 37.752869 ], [ -122.150888, 37.754158 ], [ -122.149172, 37.755651 ], [ -122.148228, 37.756805 ], [ -122.147799, 37.757823 ], [ -122.147799, 37.759587 ], [ -122.148056, 37.760401 ], [ -122.148829, 37.761691 ], [ -122.150202, 37.763794 ], [ -122.152519, 37.766712 ], [ -122.155180, 37.770918 ], [ -122.155952, 37.771732 ], [ -122.157412, 37.772954 ], [ -122.158356, 37.773564 ], [ -122.163935, 37.776414 ], [ -122.169514, 37.778924 ], [ -122.174063, 37.781366 ], [ -122.176123, 37.782655 ], [ -122.176380, 37.782926 ], [ -122.176552, 37.782926 ], [ -122.177668, 37.783604 ], [ -122.179728, 37.784079 ], [ -122.185822, 37.784215 ], [ -122.188654, 37.784418 ], [ -122.192173, 37.785232 ], [ -122.193975, 37.785911 ], [ -122.199812, 37.788895 ], [ -122.201700, 37.790523 ], [ -122.204103, 37.793168 ], [ -122.205133, 37.793982 ], [ -122.206593, 37.794796 ], [ -122.209597, 37.796221 ], [ -122.210970, 37.796831 ], [ -122.213030, 37.797441 ], [ -122.215261, 37.797916 ], [ -122.219038, 37.798933 ], [ -122.227278, 37.800629 ], [ -122.228909, 37.801104 ], [ -122.230196, 37.801850 ], [ -122.232771, 37.803952 ], [ -122.234230, 37.804969 ], [ -122.236547, 37.806190 ], [ -122.241955, 37.808563 ], [ -122.246418, 37.809784 ], [ -122.248821, 37.810598 ], [ -122.249594, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251482, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.255945, 37.820565 ], [ -122.258863, 37.821989 ], [ -122.260838, 37.822735 ], [ -122.268047, 37.824294 ], [ -122.274399, 37.825921 ], [ -122.281094, 37.827480 ], [ -122.282038, 37.827616 ], [ -122.283669, 37.827548 ], [ -122.286844, 37.826802 ], [ -122.287531, 37.826735 ], [ -122.288132, 37.826735 ], [ -122.289762, 37.827006 ], [ -122.291479, 37.827616 ], [ -122.292337, 37.828023 ], [ -122.292852, 37.828430 ], [ -122.293196, 37.828972 ], [ -122.293453, 37.829853 ], [ -122.293367, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102157651658", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.271652, 37.827548 ], [ -122.271738, 37.827548 ] ] } }
|
||||
,
|
||||
@@ -474,7 +474,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102654602215", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817175 ], [ -122.252340, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294569, 37.833039 ], [ -122.294054, 37.831819 ], [ -122.293797, 37.830395 ], [ -122.293882, 37.829379 ], [ -122.293625, 37.828565 ], [ -122.293024, 37.827955 ], [ -122.291050, 37.826870 ], [ -122.289677, 37.826396 ], [ -122.287960, 37.826328 ], [ -122.283497, 37.827209 ], [ -122.281008, 37.827209 ], [ -122.268476, 37.824158 ], [ -122.261953, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.256632, 37.820633 ], [ -122.254229, 37.819209 ], [ -122.252769, 37.817921 ], [ -122.251654, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810801 ], [ -122.248735, 37.810326 ], [ -122.242470, 37.808496 ], [ -122.241268, 37.808089 ], [ -122.238607, 37.806936 ], [ -122.238092, 37.806597 ], [ -122.236032, 37.805715 ], [ -122.234316, 37.804766 ], [ -122.233200, 37.804020 ], [ -122.230368, 37.801714 ], [ -122.228479, 37.800765 ], [ -122.216463, 37.798120 ], [ -122.215776, 37.797848 ], [ -122.213030, 37.797238 ], [ -122.210026, 37.796221 ], [ -122.208652, 37.795475 ], [ -122.206507, 37.794525 ], [ -122.204876, 37.793508 ], [ -122.201357, 37.789845 ], [ -122.200241, 37.788895 ], [ -122.198524, 37.787946 ], [ -122.193117, 37.785368 ], [ -122.190199, 37.784486 ], [ -122.188482, 37.784215 ], [ -122.185650, 37.784011 ], [ -122.179556, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.173719, 37.780959 ], [ -122.170029, 37.778992 ], [ -122.167711, 37.777838 ], [ -122.165651, 37.777024 ], [ -122.163248, 37.775871 ], [ -122.159214, 37.773836 ], [ -122.157497, 37.772750 ], [ -122.156038, 37.771529 ], [ -122.154493, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.150459, 37.763794 ], [ -122.148914, 37.761487 ], [ -122.147970, 37.759519 ], [ -122.147970, 37.757959 ], [ -122.148571, 37.756669 ], [ -122.150974, 37.754294 ], [ -122.151403, 37.753751 ], [ -122.151833, 37.752869 ], [ -122.151918, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149687, 37.746218 ], [ -122.148829, 37.744996 ], [ -122.148142, 37.744318 ], [ -122.146597, 37.743232 ], [ -122.145567, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141361, 37.738006 ], [ -122.140675, 37.737191 ], [ -122.140331, 37.736444 ], [ -122.139130, 37.731285 ], [ -122.138529, 37.729520 ], [ -122.138014, 37.726262 ], [ -122.137671, 37.725040 ], [ -122.137156, 37.723954 ], [ -122.134323, 37.720220 ], [ -122.133379, 37.718590 ], [ -122.131662, 37.714992 ], [ -122.130203, 37.713159 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486090991", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294569, 37.833039 ], [ -122.294054, 37.831819 ], [ -122.293797, 37.830395 ], [ -122.293882, 37.829379 ], [ -122.293625, 37.828565 ], [ -122.293024, 37.827955 ], [ -122.291050, 37.826870 ], [ -122.289677, 37.826396 ], [ -122.287960, 37.826328 ], [ -122.283497, 37.827209 ], [ -122.281008, 37.827209 ], [ -122.268476, 37.824158 ], [ -122.261953, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.256632, 37.820633 ], [ -122.254229, 37.819209 ], [ -122.252769, 37.817921 ], [ -122.251654, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810801 ], [ -122.248735, 37.810326 ], [ -122.242470, 37.808496 ], [ -122.241268, 37.808089 ], [ -122.238607, 37.806936 ], [ -122.238092, 37.806597 ], [ -122.236032, 37.805715 ], [ -122.234316, 37.804766 ], [ -122.233200, 37.804020 ], [ -122.230368, 37.801714 ], [ -122.228479, 37.800765 ], [ -122.216463, 37.798120 ], [ -122.215776, 37.797848 ], [ -122.213030, 37.797238 ], [ -122.210026, 37.796221 ], [ -122.208652, 37.795475 ], [ -122.206507, 37.794525 ], [ -122.204876, 37.793508 ], [ -122.201357, 37.789845 ], [ -122.200241, 37.788895 ], [ -122.198524, 37.787946 ], [ -122.193117, 37.785368 ], [ -122.190199, 37.784486 ], [ -122.188482, 37.784215 ], [ -122.185650, 37.784011 ], [ -122.179556, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.173719, 37.780959 ], [ -122.170029, 37.778992 ], [ -122.167711, 37.777838 ], [ -122.165651, 37.777024 ], [ -122.163248, 37.775871 ], [ -122.159214, 37.773836 ], [ -122.157497, 37.772750 ], [ -122.155695, 37.771122 ], [ -122.154493, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.150459, 37.763794 ], [ -122.148914, 37.761487 ], [ -122.147970, 37.759519 ], [ -122.147970, 37.757959 ], [ -122.148571, 37.756669 ], [ -122.150974, 37.754294 ], [ -122.151403, 37.753751 ], [ -122.151833, 37.752869 ], [ -122.151918, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149687, 37.746218 ], [ -122.148829, 37.744996 ], [ -122.148142, 37.744318 ], [ -122.146597, 37.743232 ], [ -122.145567, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141361, 37.738006 ], [ -122.140675, 37.737191 ], [ -122.140331, 37.736444 ], [ -122.139130, 37.731285 ], [ -122.138529, 37.729520 ], [ -122.138014, 37.726262 ], [ -122.137671, 37.725040 ], [ -122.137156, 37.723954 ], [ -122.134323, 37.720220 ], [ -122.133379, 37.718590 ], [ -122.131662, 37.714992 ], [ -122.130203, 37.713159 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638069562", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241526, 37.807275 ], [ -122.241440, 37.807071 ], [ -122.241011, 37.806868 ], [ -122.239552, 37.806732 ], [ -122.238436, 37.806054 ], [ -122.237234, 37.805647 ] ] } }
|
||||
,
|
||||
@@ -506,9 +506,9 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102156217102", "FULLNAME": "W Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.279119, 37.828430 ], [ -122.277403, 37.828362 ], [ -122.271738, 37.827548 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104475134436", "FULLNAME": "W Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254314, 37.820362 ], [ -122.254486, 37.821311 ], [ -122.254829, 37.821989 ], [ -122.257318, 37.823887 ], [ -122.258606, 37.824497 ], [ -122.260408, 37.825040 ], [ -122.263756, 37.825786 ], [ -122.265472, 37.826599 ], [ -122.266331, 37.826802 ], [ -122.275429, 37.828226 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104475134436", "FULLNAME": "W Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254314, 37.820362 ], [ -122.254486, 37.821446 ], [ -122.254829, 37.821989 ], [ -122.257318, 37.823887 ], [ -122.258606, 37.824497 ], [ -122.260408, 37.825040 ], [ -122.263756, 37.825786 ], [ -122.265472, 37.826599 ], [ -122.266331, 37.826802 ], [ -122.275429, 37.828226 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104475134288", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254314, 37.820362 ], [ -122.254486, 37.821311 ], [ -122.254829, 37.821989 ], [ -122.257318, 37.823887 ], [ -122.258606, 37.824497 ], [ -122.260408, 37.825040 ], [ -122.263756, 37.825786 ], [ -122.265472, 37.826599 ], [ -122.266331, 37.826802 ], [ -122.276115, 37.828362 ], [ -122.278605, 37.828633 ], [ -122.279634, 37.828565 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104475134288", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254314, 37.820362 ], [ -122.254486, 37.821446 ], [ -122.254829, 37.821989 ], [ -122.257318, 37.823887 ], [ -122.258606, 37.824497 ], [ -122.260408, 37.825040 ], [ -122.263756, 37.825786 ], [ -122.265472, 37.826599 ], [ -122.266331, 37.826802 ], [ -122.276115, 37.828362 ], [ -122.278605, 37.828633 ], [ -122.279634, 37.828565 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102407366406", "FULLNAME": "W Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254400, 37.820023 ], [ -122.254744, 37.821446 ] ] } }
|
||||
,
|
||||
@@ -524,9 +524,9 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1102638078801", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.229166, 37.801646 ], [ -122.227793, 37.801375 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103717593123", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227793, 37.801375 ], [ -122.220411, 37.800019 ], [ -122.220068, 37.800019 ], [ -122.219810, 37.800154 ], [ -122.219381, 37.800765 ], [ -122.219124, 37.800968 ], [ -122.218695, 37.801036 ], [ -122.208824, 37.798527 ], [ -122.207623, 37.798662 ], [ -122.204790, 37.797374 ], [ -122.201185, 37.794389 ], [ -122.195349, 37.787946 ], [ -122.193117, 37.785843 ], [ -122.192602, 37.785639 ], [ -122.190027, 37.785165 ], [ -122.188053, 37.784554 ], [ -122.187624, 37.784554 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1103717593123", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227793, 37.801375 ], [ -122.220411, 37.800019 ], [ -122.220068, 37.800019 ], [ -122.219810, 37.800154 ], [ -122.219124, 37.800968 ], [ -122.218695, 37.801036 ], [ -122.208824, 37.798527 ], [ -122.207623, 37.798662 ], [ -122.204790, 37.797374 ], [ -122.201185, 37.794389 ], [ -122.195349, 37.787946 ], [ -122.193117, 37.785843 ], [ -122.192602, 37.785639 ], [ -122.190027, 37.785165 ], [ -122.188053, 37.784554 ], [ -122.187624, 37.784554 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227793, 37.801375 ], [ -122.226934, 37.801104 ], [ -122.225819, 37.800968 ], [ -122.220669, 37.799951 ], [ -122.219982, 37.799951 ], [ -122.219639, 37.800222 ], [ -122.219210, 37.800832 ], [ -122.218952, 37.800968 ], [ -122.218609, 37.800968 ], [ -122.216721, 37.800493 ], [ -122.216291, 37.800290 ], [ -122.208824, 37.798459 ], [ -122.207708, 37.798594 ], [ -122.207193, 37.798391 ], [ -122.204962, 37.797374 ], [ -122.202129, 37.795135 ], [ -122.199554, 37.792558 ], [ -122.194920, 37.787335 ], [ -122.193460, 37.786046 ], [ -122.192688, 37.785639 ], [ -122.190456, 37.785232 ], [ -122.189255, 37.784893 ], [ -122.188654, 37.784554 ], [ -122.188311, 37.783808 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275689", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.227793, 37.801375 ], [ -122.226934, 37.801104 ], [ -122.225819, 37.800968 ], [ -122.220669, 37.799951 ], [ -122.219982, 37.799951 ], [ -122.219639, 37.800222 ], [ -122.219210, 37.800832 ], [ -122.218952, 37.800968 ], [ -122.218609, 37.800968 ], [ -122.216721, 37.800493 ], [ -122.216291, 37.800290 ], [ -122.208824, 37.798459 ], [ -122.207708, 37.798594 ], [ -122.206764, 37.798187 ], [ -122.204962, 37.797374 ], [ -122.202129, 37.795135 ], [ -122.199554, 37.792558 ], [ -122.194920, 37.787335 ], [ -122.193460, 37.786046 ], [ -122.192688, 37.785639 ], [ -122.190456, 37.785232 ], [ -122.189255, 37.784893 ], [ -122.188654, 37.784554 ], [ -122.188311, 37.783808 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1105281275688", "FULLNAME": "Macarthur Blvd", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.194061, 37.786318 ], [ -122.193117, 37.785368 ], [ -122.192001, 37.784690 ], [ -122.188826, 37.783808 ] ] } }
|
||||
,
|
||||
|
||||
@@ -112,7 +112,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 8, "x": 41, "y": 98 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "macarthur", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.105484, 37.696861 ], [ -122.109261, 37.700936 ], [ -122.116814, 37.705553 ], [ -122.120934, 37.707183 ], [ -122.124710, 37.710171 ], [ -122.128830, 37.712615 ], [ -122.131233, 37.714788 ], [ -122.133293, 37.718590 ], [ -122.137413, 37.724836 ], [ -122.140503, 37.737327 ], [ -122.143936, 37.740313 ], [ -122.145653, 37.742757 ], [ -122.148743, 37.745472 ], [ -122.151489, 37.750087 ], [ -122.151489, 37.752801 ], [ -122.148056, 37.756873 ], [ -122.147713, 37.759587 ], [ -122.155266, 37.770986 ], [ -122.157326, 37.772886 ], [ -122.169342, 37.778856 ], [ -122.177582, 37.783469 ], [ -122.179642, 37.784011 ], [ -122.188568, 37.784283 ], [ -122.194061, 37.785911 ], [ -122.199898, 37.788895 ], [ -122.205048, 37.794050 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797306 ], [ -122.228394, 37.800832 ], [ -122.236633, 37.806258 ], [ -122.241783, 37.808428 ], [ -122.248306, 37.810326 ], [ -122.250023, 37.811683 ], [ -122.251396, 37.816565 ], [ -122.252769, 37.818192 ], [ -122.255859, 37.820633 ], [ -122.258949, 37.821989 ], [ -122.281609, 37.827413 ], [ -122.284012, 37.827413 ], [ -122.287445, 37.826599 ], [ -122.289848, 37.826870 ], [ -122.292938, 37.828497 ], [ -122.293282, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.105484, 37.696861 ], [ -122.109261, 37.700936 ], [ -122.116814, 37.705553 ], [ -122.120934, 37.707183 ], [ -122.124710, 37.710171 ], [ -122.128830, 37.712615 ], [ -122.131233, 37.714788 ], [ -122.133293, 37.718590 ], [ -122.137413, 37.724836 ], [ -122.140503, 37.737327 ], [ -122.143936, 37.740313 ], [ -122.145653, 37.742757 ], [ -122.148743, 37.745472 ], [ -122.151489, 37.750087 ], [ -122.151489, 37.752801 ], [ -122.148056, 37.756873 ], [ -122.147713, 37.759587 ], [ -122.155266, 37.770986 ], [ -122.157326, 37.772886 ], [ -122.169342, 37.778856 ], [ -122.177582, 37.783469 ], [ -122.179642, 37.784011 ], [ -122.188568, 37.784283 ], [ -122.194061, 37.785911 ], [ -122.199898, 37.788895 ], [ -122.205048, 37.794050 ], [ -122.209511, 37.796221 ], [ -122.216721, 37.798391 ], [ -122.228394, 37.800832 ], [ -122.236633, 37.806258 ], [ -122.241783, 37.808428 ], [ -122.248306, 37.810326 ], [ -122.250023, 37.811683 ], [ -122.251396, 37.816565 ], [ -122.252769, 37.818192 ], [ -122.255859, 37.820633 ], [ -122.258949, 37.821989 ], [ -122.281609, 37.827413 ], [ -122.284012, 37.827413 ], [ -122.287445, 37.826599 ], [ -122.289848, 37.826870 ], [ -122.292938, 37.828497 ], [ -122.293282, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486392881", "FULLNAME": "W Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254829, 37.821446 ], [ -122.256889, 37.823345 ], [ -122.259293, 37.824701 ], [ -122.265816, 37.826599 ], [ -122.271652, 37.827413 ] ] } }
|
||||
,
|
||||
@@ -120,7 +120,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "first", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817107 ], [ -122.252426, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294655, 37.833107 ], [ -122.293625, 37.828497 ], [ -122.290878, 37.826870 ], [ -122.287788, 37.826328 ], [ -122.283325, 37.827141 ], [ -122.280922, 37.827141 ], [ -122.258949, 37.821718 ], [ -122.254143, 37.819277 ], [ -122.252769, 37.817921 ], [ -122.251740, 37.816022 ], [ -122.250366, 37.811954 ], [ -122.248650, 37.810326 ], [ -122.238693, 37.806800 ], [ -122.234230, 37.804630 ], [ -122.228394, 37.800832 ], [ -122.216377, 37.798120 ], [ -122.209854, 37.796221 ], [ -122.204704, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.188911, 37.784283 ], [ -122.178268, 37.783469 ], [ -122.157326, 37.772614 ], [ -122.155266, 37.770443 ], [ -122.148056, 37.759587 ], [ -122.148056, 37.757959 ], [ -122.148399, 37.756601 ], [ -122.151833, 37.752801 ], [ -122.151489, 37.750087 ], [ -122.148743, 37.744929 ], [ -122.145653, 37.742214 ], [ -122.143936, 37.740042 ], [ -122.140503, 37.737055 ], [ -122.137756, 37.725108 ], [ -122.133293, 37.718590 ], [ -122.131233, 37.714245 ], [ -122.129173, 37.712344 ], [ -122.124367, 37.709628 ], [ -122.121620, 37.707455 ], [ -122.111664, 37.702294 ], [ -122.108231, 37.699578 ], [ -122.105827, 37.696861 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294655, 37.833107 ], [ -122.293625, 37.828497 ], [ -122.290878, 37.826870 ], [ -122.287788, 37.826328 ], [ -122.283325, 37.827141 ], [ -122.280922, 37.827141 ], [ -122.258949, 37.821718 ], [ -122.254143, 37.819277 ], [ -122.252769, 37.817921 ], [ -122.251740, 37.816022 ], [ -122.250366, 37.811954 ], [ -122.248650, 37.810326 ], [ -122.238693, 37.806800 ], [ -122.234230, 37.804630 ], [ -122.228394, 37.800832 ], [ -122.216377, 37.798120 ], [ -122.209854, 37.796221 ], [ -122.204704, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.188911, 37.784283 ], [ -122.178268, 37.783469 ], [ -122.157326, 37.772614 ], [ -122.155266, 37.770443 ], [ -122.148056, 37.759587 ], [ -122.148056, 37.757959 ], [ -122.148399, 37.756601 ], [ -122.151833, 37.752801 ], [ -122.151489, 37.750087 ], [ -122.148743, 37.744929 ], [ -122.145653, 37.742214 ], [ -122.140503, 37.737055 ], [ -122.137756, 37.725108 ], [ -122.133293, 37.718590 ], [ -122.131233, 37.714245 ], [ -122.129173, 37.712344 ], [ -122.124367, 37.709628 ], [ -122.121620, 37.707455 ], [ -122.111664, 37.702294 ], [ -122.108231, 37.699578 ], [ -122.105827, 37.696861 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "first", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241440, 37.807343 ], [ -122.237320, 37.805715 ] ] } }
|
||||
,
|
||||
@@ -156,7 +156,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 9, "x": 82, "y": 197 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "macarthur", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.121449, 37.707726 ], [ -122.124882, 37.710307 ], [ -122.128315, 37.712072 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715060 ], [ -122.133121, 37.718590 ], [ -122.137241, 37.724836 ], [ -122.138271, 37.729724 ], [ -122.140503, 37.737327 ], [ -122.141190, 37.738277 ], [ -122.143764, 37.740313 ], [ -122.145481, 37.742621 ], [ -122.148743, 37.745200 ], [ -122.151318, 37.750222 ], [ -122.151661, 37.751580 ], [ -122.151489, 37.752801 ], [ -122.150803, 37.754158 ], [ -122.148399, 37.756466 ], [ -122.147713, 37.757823 ], [ -122.147713, 37.759587 ], [ -122.148743, 37.761623 ], [ -122.152519, 37.766644 ], [ -122.154579, 37.770172 ], [ -122.155437, 37.771258 ], [ -122.157326, 37.772886 ], [ -122.163849, 37.776414 ], [ -122.169514, 37.778856 ], [ -122.173977, 37.781298 ], [ -122.177582, 37.783604 ], [ -122.179642, 37.784011 ], [ -122.187881, 37.784283 ], [ -122.192173, 37.785232 ], [ -122.194405, 37.786046 ], [ -122.199726, 37.788895 ], [ -122.205048, 37.793915 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797441 ], [ -122.228909, 37.801104 ], [ -122.230110, 37.801782 ], [ -122.234230, 37.804901 ], [ -122.236462, 37.806122 ], [ -122.241955, 37.808563 ], [ -122.248821, 37.810598 ], [ -122.249508, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251396, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.258778, 37.821989 ], [ -122.260838, 37.822667 ], [ -122.281437, 37.827548 ], [ -122.283669, 37.827548 ], [ -122.287445, 37.826735 ], [ -122.289677, 37.827006 ], [ -122.291393, 37.827548 ], [ -122.292767, 37.828362 ], [ -122.293453, 37.829853 ], [ -122.293282, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.121449, 37.707726 ], [ -122.124882, 37.710307 ], [ -122.128315, 37.712072 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715060 ], [ -122.133121, 37.718590 ], [ -122.137241, 37.724836 ], [ -122.138271, 37.729724 ], [ -122.140503, 37.737327 ], [ -122.141190, 37.738277 ], [ -122.143764, 37.740313 ], [ -122.145481, 37.742621 ], [ -122.148743, 37.745200 ], [ -122.151318, 37.750222 ], [ -122.151661, 37.751580 ], [ -122.151489, 37.752801 ], [ -122.150803, 37.754158 ], [ -122.149086, 37.755651 ], [ -122.148056, 37.757144 ], [ -122.147713, 37.758501 ], [ -122.147713, 37.759587 ], [ -122.148743, 37.761623 ], [ -122.152519, 37.766644 ], [ -122.154579, 37.770172 ], [ -122.155437, 37.771258 ], [ -122.157326, 37.772886 ], [ -122.163849, 37.776414 ], [ -122.169514, 37.778856 ], [ -122.173977, 37.781298 ], [ -122.177582, 37.783604 ], [ -122.179642, 37.784011 ], [ -122.187881, 37.784283 ], [ -122.192173, 37.785232 ], [ -122.194405, 37.786046 ], [ -122.199726, 37.788895 ], [ -122.205048, 37.793915 ], [ -122.209511, 37.796221 ], [ -122.212944, 37.797441 ], [ -122.228909, 37.801104 ], [ -122.230110, 37.801782 ], [ -122.234230, 37.804901 ], [ -122.236462, 37.806122 ], [ -122.241955, 37.808563 ], [ -122.248821, 37.810598 ], [ -122.249508, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251396, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.258778, 37.821989 ], [ -122.260838, 37.822667 ], [ -122.281437, 37.827548 ], [ -122.283669, 37.827548 ], [ -122.287445, 37.826735 ], [ -122.289677, 37.827006 ], [ -122.291393, 37.827548 ], [ -122.292767, 37.828362 ], [ -122.293453, 37.829853 ], [ -122.293282, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "1104486392881", "FULLNAME": "W Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.254658, 37.821446 ], [ -122.255173, 37.822124 ], [ -122.257404, 37.823752 ], [ -122.259293, 37.824565 ], [ -122.263584, 37.825650 ], [ -122.265816, 37.826599 ], [ -122.271652, 37.827548 ] ] } }
|
||||
,
|
||||
@@ -164,7 +164,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "first", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817107 ], [ -122.252254, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294483, 37.832972 ], [ -122.293968, 37.831751 ], [ -122.293625, 37.828497 ], [ -122.292938, 37.827955 ], [ -122.291222, 37.827006 ], [ -122.289677, 37.826328 ], [ -122.287960, 37.826328 ], [ -122.282810, 37.827277 ], [ -122.280922, 37.827141 ], [ -122.268391, 37.824158 ], [ -122.261868, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.254143, 37.819141 ], [ -122.252769, 37.817921 ], [ -122.251568, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810733 ], [ -122.248650, 37.810326 ], [ -122.242470, 37.808428 ], [ -122.238522, 37.806936 ], [ -122.234230, 37.804766 ], [ -122.230282, 37.801646 ], [ -122.228394, 37.800697 ], [ -122.216377, 37.798120 ], [ -122.210026, 37.796221 ], [ -122.204876, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.190113, 37.784418 ], [ -122.188396, 37.784147 ], [ -122.179470, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.170029, 37.778992 ], [ -122.163162, 37.775871 ], [ -122.157497, 37.772750 ], [ -122.155952, 37.771529 ], [ -122.154408, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.148914, 37.761487 ], [ -122.147884, 37.759451 ], [ -122.147884, 37.757959 ], [ -122.148571, 37.756601 ], [ -122.150974, 37.754294 ], [ -122.151833, 37.752801 ], [ -122.151833, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149601, 37.746150 ], [ -122.148743, 37.744929 ], [ -122.145481, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141018, 37.737598 ], [ -122.140503, 37.736919 ], [ -122.138443, 37.729453 ], [ -122.137585, 37.724972 ], [ -122.137070, 37.723886 ], [ -122.134323, 37.720220 ], [ -122.133293, 37.718590 ], [ -122.131577, 37.714924 ], [ -122.130032, 37.713023 ], [ -122.128143, 37.711665 ], [ -122.124367, 37.709628 ], [ -122.121792, 37.707726 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294483, 37.832972 ], [ -122.293968, 37.831751 ], [ -122.293625, 37.828497 ], [ -122.292938, 37.827955 ], [ -122.291222, 37.827006 ], [ -122.289677, 37.826328 ], [ -122.287960, 37.826328 ], [ -122.282810, 37.827277 ], [ -122.280922, 37.827141 ], [ -122.268391, 37.824158 ], [ -122.261868, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.254143, 37.819141 ], [ -122.252769, 37.817921 ], [ -122.251568, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810733 ], [ -122.248650, 37.810326 ], [ -122.242470, 37.808428 ], [ -122.238522, 37.806936 ], [ -122.234230, 37.804766 ], [ -122.230282, 37.801646 ], [ -122.228394, 37.800697 ], [ -122.216377, 37.798120 ], [ -122.210026, 37.796221 ], [ -122.204876, 37.793508 ], [ -122.200241, 37.788895 ], [ -122.193031, 37.785368 ], [ -122.190113, 37.784418 ], [ -122.188396, 37.784147 ], [ -122.179470, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.170029, 37.778992 ], [ -122.163162, 37.775871 ], [ -122.157497, 37.772750 ], [ -122.155609, 37.771122 ], [ -122.154408, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.148914, 37.761487 ], [ -122.147884, 37.759451 ], [ -122.147884, 37.757959 ], [ -122.148571, 37.756601 ], [ -122.150974, 37.754294 ], [ -122.151833, 37.752801 ], [ -122.151833, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149601, 37.746150 ], [ -122.148743, 37.744929 ], [ -122.145481, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141018, 37.737598 ], [ -122.140503, 37.736919 ], [ -122.138443, 37.729453 ], [ -122.137585, 37.724972 ], [ -122.137070, 37.723886 ], [ -122.134323, 37.720220 ], [ -122.133293, 37.718590 ], [ -122.131577, 37.714924 ], [ -122.130032, 37.713023 ], [ -122.128143, 37.711665 ], [ -122.124367, 37.709628 ], [ -122.121792, 37.707726 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "first", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241440, 37.807207 ], [ -122.240925, 37.806800 ], [ -122.239380, 37.806665 ], [ -122.238350, 37.805986 ], [ -122.237148, 37.805580 ] ] } }
|
||||
,
|
||||
@@ -186,7 +186,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "first", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.158871, 37.749951 ], [ -122.157669, 37.748186 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "first", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.142906, 37.738141 ], [ -122.151318, 37.742214 ], [ -122.153378, 37.743978 ], [ -122.156296, 37.746015 ], [ -122.157154, 37.747372 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "first", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.142906, 37.738141 ], [ -122.151318, 37.742214 ], [ -122.154751, 37.745064 ], [ -122.156296, 37.746015 ], [ -122.157154, 37.747372 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -200,7 +200,7 @@
|
||||
,
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 10, "x": 164, "y": 395 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "macarthur", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.129774, 37.713159 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715128 ], [ -122.133121, 37.718590 ], [ -122.134151, 37.720356 ], [ -122.136984, 37.724157 ], [ -122.137327, 37.724836 ], [ -122.137842, 37.726873 ], [ -122.138357, 37.729792 ], [ -122.139387, 37.733186 ], [ -122.139988, 37.736105 ], [ -122.140503, 37.737327 ], [ -122.141275, 37.738277 ], [ -122.143164, 37.739702 ], [ -122.143850, 37.740381 ], [ -122.145567, 37.742689 ], [ -122.146339, 37.743368 ], [ -122.147713, 37.744250 ], [ -122.148743, 37.745200 ], [ -122.149343, 37.746082 ], [ -122.151403, 37.750222 ], [ -122.151747, 37.751580 ], [ -122.151575, 37.752869 ], [ -122.150888, 37.754158 ], [ -122.149172, 37.755651 ], [ -122.148228, 37.756805 ], [ -122.147799, 37.757823 ], [ -122.147799, 37.759587 ], [ -122.148056, 37.760401 ], [ -122.148829, 37.761691 ], [ -122.150202, 37.763794 ], [ -122.152519, 37.766712 ], [ -122.155180, 37.770918 ], [ -122.155952, 37.771732 ], [ -122.157412, 37.772954 ], [ -122.158356, 37.773564 ], [ -122.163935, 37.776414 ], [ -122.169514, 37.778924 ], [ -122.174063, 37.781366 ], [ -122.176123, 37.782655 ], [ -122.176380, 37.782926 ], [ -122.176552, 37.782926 ], [ -122.177668, 37.783604 ], [ -122.179728, 37.784079 ], [ -122.185822, 37.784215 ], [ -122.188654, 37.784418 ], [ -122.192173, 37.785232 ], [ -122.193975, 37.785911 ], [ -122.199812, 37.788895 ], [ -122.201700, 37.790523 ], [ -122.204103, 37.793168 ], [ -122.205133, 37.793982 ], [ -122.206593, 37.794796 ], [ -122.209597, 37.796221 ], [ -122.210970, 37.796831 ], [ -122.213030, 37.797441 ], [ -122.215261, 37.797916 ], [ -122.219038, 37.798933 ], [ -122.227278, 37.800629 ], [ -122.228909, 37.801104 ], [ -122.230196, 37.801850 ], [ -122.232771, 37.803952 ], [ -122.234230, 37.804969 ], [ -122.236547, 37.806190 ], [ -122.241011, 37.808224 ], [ -122.246418, 37.809784 ], [ -122.248821, 37.810598 ], [ -122.249594, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251482, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.255945, 37.820565 ], [ -122.258863, 37.821989 ], [ -122.260838, 37.822735 ], [ -122.268047, 37.824294 ], [ -122.274399, 37.825921 ], [ -122.281094, 37.827480 ], [ -122.282038, 37.827616 ], [ -122.283669, 37.827548 ], [ -122.286844, 37.826802 ], [ -122.287531, 37.826735 ], [ -122.288132, 37.826735 ], [ -122.289762, 37.827006 ], [ -122.291479, 37.827616 ], [ -122.292337, 37.828023 ], [ -122.292852, 37.828430 ], [ -122.293196, 37.828972 ], [ -122.293453, 37.829853 ], [ -122.293367, 37.830938 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.129774, 37.713159 ], [ -122.130375, 37.713702 ], [ -122.131405, 37.715128 ], [ -122.133121, 37.718590 ], [ -122.134151, 37.720356 ], [ -122.136984, 37.724157 ], [ -122.137327, 37.724836 ], [ -122.137842, 37.726873 ], [ -122.138357, 37.729792 ], [ -122.139387, 37.733186 ], [ -122.139988, 37.736105 ], [ -122.140503, 37.737327 ], [ -122.141275, 37.738277 ], [ -122.143164, 37.739702 ], [ -122.143850, 37.740381 ], [ -122.145567, 37.742689 ], [ -122.146339, 37.743368 ], [ -122.148142, 37.744589 ], [ -122.148743, 37.745200 ], [ -122.149343, 37.746082 ], [ -122.151403, 37.750222 ], [ -122.151747, 37.751580 ], [ -122.151575, 37.752869 ], [ -122.150888, 37.754158 ], [ -122.149172, 37.755651 ], [ -122.148228, 37.756805 ], [ -122.147799, 37.757823 ], [ -122.147799, 37.759587 ], [ -122.148056, 37.760401 ], [ -122.148829, 37.761691 ], [ -122.150202, 37.763794 ], [ -122.152519, 37.766712 ], [ -122.155180, 37.770918 ], [ -122.155952, 37.771732 ], [ -122.157412, 37.772954 ], [ -122.158356, 37.773564 ], [ -122.163935, 37.776414 ], [ -122.169514, 37.778924 ], [ -122.174063, 37.781366 ], [ -122.176123, 37.782655 ], [ -122.176380, 37.782926 ], [ -122.176552, 37.782926 ], [ -122.177668, 37.783604 ], [ -122.179728, 37.784079 ], [ -122.185822, 37.784215 ], [ -122.188654, 37.784418 ], [ -122.192173, 37.785232 ], [ -122.193975, 37.785911 ], [ -122.199812, 37.788895 ], [ -122.201700, 37.790523 ], [ -122.204103, 37.793168 ], [ -122.205133, 37.793982 ], [ -122.206593, 37.794796 ], [ -122.209597, 37.796221 ], [ -122.210970, 37.796831 ], [ -122.213030, 37.797441 ], [ -122.215261, 37.797916 ], [ -122.219038, 37.798933 ], [ -122.227278, 37.800629 ], [ -122.228909, 37.801104 ], [ -122.230196, 37.801850 ], [ -122.232771, 37.803952 ], [ -122.234230, 37.804969 ], [ -122.236547, 37.806190 ], [ -122.241955, 37.808563 ], [ -122.246418, 37.809784 ], [ -122.248821, 37.810598 ], [ -122.249594, 37.811140 ], [ -122.250195, 37.811954 ], [ -122.251482, 37.816293 ], [ -122.252598, 37.818056 ], [ -122.254314, 37.819548 ], [ -122.255945, 37.820565 ], [ -122.258863, 37.821989 ], [ -122.260838, 37.822735 ], [ -122.268047, 37.824294 ], [ -122.274399, 37.825921 ], [ -122.281094, 37.827480 ], [ -122.282038, 37.827616 ], [ -122.283669, 37.827548 ], [ -122.286844, 37.826802 ], [ -122.287531, 37.826735 ], [ -122.288132, 37.826735 ], [ -122.289762, 37.827006 ], [ -122.291479, 37.827616 ], [ -122.292337, 37.828023 ], [ -122.292852, 37.828430 ], [ -122.293196, 37.828972 ], [ -122.293453, 37.829853 ], [ -122.293367, 37.830938 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "first", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.271652, 37.827548 ], [ -122.271738, 37.827548 ] ] } }
|
||||
,
|
||||
@@ -210,7 +210,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "first", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.252769, 37.817175 ], [ -122.252340, 37.816293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294569, 37.833039 ], [ -122.294054, 37.831819 ], [ -122.293797, 37.830395 ], [ -122.293882, 37.829379 ], [ -122.293625, 37.828565 ], [ -122.293024, 37.827955 ], [ -122.291050, 37.826870 ], [ -122.289677, 37.826396 ], [ -122.287960, 37.826328 ], [ -122.283497, 37.827209 ], [ -122.281008, 37.827209 ], [ -122.268476, 37.824158 ], [ -122.261953, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.256632, 37.820633 ], [ -122.254229, 37.819209 ], [ -122.252769, 37.817921 ], [ -122.251654, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810801 ], [ -122.248735, 37.810326 ], [ -122.242470, 37.808496 ], [ -122.241268, 37.808089 ], [ -122.238607, 37.806936 ], [ -122.238092, 37.806597 ], [ -122.236032, 37.805715 ], [ -122.234316, 37.804766 ], [ -122.233200, 37.804020 ], [ -122.230368, 37.801714 ], [ -122.228479, 37.800765 ], [ -122.216463, 37.798120 ], [ -122.215776, 37.797848 ], [ -122.213030, 37.797238 ], [ -122.210026, 37.796221 ], [ -122.208652, 37.795475 ], [ -122.206507, 37.794525 ], [ -122.204876, 37.793508 ], [ -122.201357, 37.789845 ], [ -122.200241, 37.788895 ], [ -122.198524, 37.787946 ], [ -122.193117, 37.785368 ], [ -122.190199, 37.784486 ], [ -122.188482, 37.784215 ], [ -122.185650, 37.784011 ], [ -122.179556, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.173719, 37.780959 ], [ -122.170029, 37.778992 ], [ -122.167711, 37.777838 ], [ -122.165651, 37.777024 ], [ -122.163248, 37.775871 ], [ -122.159214, 37.773836 ], [ -122.157497, 37.772750 ], [ -122.156038, 37.771529 ], [ -122.154493, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.150459, 37.763794 ], [ -122.148914, 37.761487 ], [ -122.147970, 37.759519 ], [ -122.147970, 37.757959 ], [ -122.148571, 37.756669 ], [ -122.150974, 37.754294 ], [ -122.151403, 37.753751 ], [ -122.151833, 37.752869 ], [ -122.151918, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149687, 37.746218 ], [ -122.148829, 37.744996 ], [ -122.148142, 37.744318 ], [ -122.146597, 37.743232 ], [ -122.145567, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141361, 37.738006 ], [ -122.140675, 37.737191 ], [ -122.140331, 37.736444 ], [ -122.139130, 37.731285 ], [ -122.138529, 37.729520 ], [ -122.138014, 37.726262 ], [ -122.137671, 37.725040 ], [ -122.137156, 37.723954 ], [ -122.134323, 37.720220 ], [ -122.133379, 37.718590 ], [ -122.131662, 37.714992 ], [ -122.130203, 37.713159 ] ] } }
|
||||
{ "type": "Feature", "properties": { "LINEARID": "second", "FULLNAME": "Macarthur Fwy", "RTTYP": "M", "MTFCC": "S1100" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.294569, 37.833039 ], [ -122.294054, 37.831819 ], [ -122.293797, 37.830395 ], [ -122.293882, 37.829379 ], [ -122.293625, 37.828565 ], [ -122.293024, 37.827955 ], [ -122.291050, 37.826870 ], [ -122.289677, 37.826396 ], [ -122.287960, 37.826328 ], [ -122.283497, 37.827209 ], [ -122.281008, 37.827209 ], [ -122.268476, 37.824158 ], [ -122.261953, 37.822802 ], [ -122.259121, 37.821853 ], [ -122.256632, 37.820633 ], [ -122.254229, 37.819209 ], [ -122.252769, 37.817921 ], [ -122.251654, 37.816158 ], [ -122.250538, 37.812089 ], [ -122.249508, 37.810801 ], [ -122.248735, 37.810326 ], [ -122.242470, 37.808496 ], [ -122.241268, 37.808089 ], [ -122.238607, 37.806936 ], [ -122.238092, 37.806597 ], [ -122.236032, 37.805715 ], [ -122.234316, 37.804766 ], [ -122.233200, 37.804020 ], [ -122.230368, 37.801714 ], [ -122.228479, 37.800765 ], [ -122.216463, 37.798120 ], [ -122.215776, 37.797848 ], [ -122.213030, 37.797238 ], [ -122.210026, 37.796221 ], [ -122.208652, 37.795475 ], [ -122.206507, 37.794525 ], [ -122.204876, 37.793508 ], [ -122.201357, 37.789845 ], [ -122.200241, 37.788895 ], [ -122.198524, 37.787946 ], [ -122.193117, 37.785368 ], [ -122.190199, 37.784486 ], [ -122.188482, 37.784215 ], [ -122.185650, 37.784011 ], [ -122.179556, 37.783876 ], [ -122.178268, 37.783604 ], [ -122.173719, 37.780959 ], [ -122.170029, 37.778992 ], [ -122.167711, 37.777838 ], [ -122.165651, 37.777024 ], [ -122.163248, 37.775871 ], [ -122.159214, 37.773836 ], [ -122.157497, 37.772750 ], [ -122.155695, 37.771122 ], [ -122.154493, 37.769629 ], [ -122.152348, 37.766101 ], [ -122.150459, 37.763794 ], [ -122.148914, 37.761487 ], [ -122.147970, 37.759519 ], [ -122.147970, 37.757959 ], [ -122.148571, 37.756669 ], [ -122.150974, 37.754294 ], [ -122.151403, 37.753751 ], [ -122.151833, 37.752869 ], [ -122.151918, 37.751172 ], [ -122.151661, 37.750222 ], [ -122.149687, 37.746218 ], [ -122.148829, 37.744996 ], [ -122.148142, 37.744318 ], [ -122.146597, 37.743232 ], [ -122.145567, 37.742349 ], [ -122.143936, 37.740178 ], [ -122.141361, 37.738006 ], [ -122.140675, 37.737191 ], [ -122.140331, 37.736444 ], [ -122.139130, 37.731285 ], [ -122.138529, 37.729520 ], [ -122.138014, 37.726262 ], [ -122.137671, 37.725040 ], [ -122.137156, 37.723954 ], [ -122.134323, 37.720220 ], [ -122.133379, 37.718590 ], [ -122.131662, 37.714992 ], [ -122.130203, 37.713159 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "LINEARID": "first", "FULLNAME": "Macarthur", "RTTYP": "M", "MTFCC": "S1400" }, "geometry": { "type": "LineString", "coordinates": [ [ -122.241526, 37.807275 ], [ -122.241440, 37.807071 ], [ -122.241011, 37.806868 ], [ -122.239552, 37.806732 ], [ -122.238436, 37.806054 ], [ -122.237234, 37.805647 ] ] } }
|
||||
,
|
||||
|
||||
+227
-227
File diff suppressed because it is too large
Load Diff
+227
-227
File diff suppressed because it is too large
Load Diff
@@ -8,6 +8,7 @@
|
||||
"maxzoom": "0",
|
||||
"minzoom": "0",
|
||||
"name": "tests/layer-json/out.mbtiles",
|
||||
"tippecanoe_decisions": "{\"basezoom\":0,\"droprate\":1,\"retain_points_multiplier\":1}",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"maxzoom": "0",
|
||||
"minzoom": "0",
|
||||
"name": "tests/loop/out/-z0_-O200_--cluster-densest-as-needed.json.check.mbtiles",
|
||||
"strategies": "[{\"coalesced_as_needed\":999,\"feature_count_desired\":1000}]",
|
||||
"strategies": "[{\"coalesced_as_needed\":999,\"feature_count_desired\":201}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"maxzoom": "0",
|
||||
"minzoom": "0",
|
||||
"name": "tests/loop/out/-z0_-O200_--drop-densest-as-needed.json.check.mbtiles",
|
||||
"strategies": "[{\"dropped_as_needed\":999,\"feature_count_desired\":1000}]",
|
||||
"strategies": "[{\"dropped_as_needed\":999,\"feature_count_desired\":201}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
@@ -9,389 +9,13 @@
|
||||
"maxzoom": "0",
|
||||
"minzoom": "0",
|
||||
"name": "tests/loop/out/-z0_-O200_--drop-fraction-as-needed.json.check.mbtiles",
|
||||
"strategies": "[{\"dropped_as_needed\":811,\"feature_count_desired\":1000}]",
|
||||
"strategies": "[{\"dropped_as_needed\":999,\"feature_count_desired\":201}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 0, "x": 0, "y": 0 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 0.966751 ] } }
|
||||
] }
|
||||
] }
|
||||
] }
|
||||
|
||||
@@ -877,7 +877,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -96.448975, 43.500752 ], [ -96.437988, 44.433780 ], [ -96.558838, 45.390735 ], [ -96.734619, 45.467836 ], [ -96.833496, 45.621722 ], [ -96.778564, 45.759859 ], [ -96.558838, 45.874712 ], [ -96.536865, 46.019853 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -91.230469, 43.500752 ], [ -92.537842, 43.516689 ], [ -96.448975, 43.500752 ] ] } }
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -91.230469, 43.500752 ], [ -92.537842, 43.516689 ], [ -93.999023, 43.516689 ], [ -96.448975, 43.500752 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -96.459961, 42.488302 ], [ -96.448975, 42.577355 ], [ -96.613770, 42.690511 ], [ -96.536865, 42.851806 ], [ -96.459961, 43.125043 ], [ -96.591797, 43.261206 ], [ -96.580811, 43.500752 ], [ -96.448975, 43.500752 ] ] } }
|
||||
,
|
||||
|
||||
@@ -887,7 +887,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -96.448975, 43.500752 ], [ -96.437988, 44.433780 ], [ -96.558838, 45.390735 ], [ -96.734619, 45.467836 ], [ -96.833496, 45.621722 ], [ -96.778564, 45.759859 ], [ -96.558838, 45.874712 ], [ -96.536865, 46.019853 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -91.230469, 43.500752 ], [ -92.537842, 43.516689 ], [ -96.448975, 43.500752 ] ] } }
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -91.230469, 43.500752 ], [ -92.537842, 43.516689 ], [ -93.999023, 43.516689 ], [ -96.448975, 43.500752 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -96.459961, 42.488302 ], [ -96.448975, 42.577355 ], [ -96.613770, 42.690511 ], [ -96.536865, 42.851806 ], [ -96.459961, 43.125043 ], [ -96.591797, 43.261206 ], [ -96.580811, 43.500752 ], [ -96.448975, 43.500752 ] ] } }
|
||||
,
|
||||
|
||||
@@ -188,7 +188,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Divisadero St & North Point St" }, "geometry": { "type": "Point", "coordinates": [ -122.443528, 37.802833 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "North Point St & Divisadero St" }, "geometry": { "type": "Point", "coordinates": [ -122.443271, 37.802867 ] } }
|
||||
{ "type": "Feature", "properties": { "name": "North Point St & Divisadero St" }, "geometry": { "type": "Point", "coordinates": [ -122.443271, 37.802833 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Divisadero St & Bay St" }, "geometry": { "type": "Point", "coordinates": [ -122.443314, 37.801918 ] } }
|
||||
,
|
||||
@@ -1260,7 +1260,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Quintara St & 35th Ave" }, "geometry": { "type": "Point", "coordinates": [ -122.493095, 37.747949 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Quintara St & 35th Ave" }, "geometry": { "type": "Point", "coordinates": [ -122.493353, 37.747847 ] } }
|
||||
{ "type": "Feature", "properties": { "name": "Quintara St & 35th Ave" }, "geometry": { "type": "Point", "coordinates": [ -122.493353, 37.747813 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Sunset Blvd & Rivera St" }, "geometry": { "type": "Point", "coordinates": [ -122.494812, 37.746082 ] } }
|
||||
,
|
||||
@@ -2454,7 +2454,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Cole St & Haight St" }, "geometry": { "type": "Point", "coordinates": [ -122.450609, 37.769460 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Haight St & Clayton St" }, "geometry": { "type": "Point", "coordinates": [ -122.448678, 37.769731 ] } }
|
||||
{ "type": "Feature", "properties": { "name": "Haight St & Clayton St" }, "geometry": { "type": "Point", "coordinates": [ -122.448678, 37.769697 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Haight St & Clayton St" }, "geometry": { "type": "Point", "coordinates": [ -122.448463, 37.769901 ] } }
|
||||
,
|
||||
@@ -3226,7 +3226,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Garfield St & Beverly St" }, "geometry": { "type": "Point", "coordinates": [ -122.471552, 37.719711 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Junipero Serra Blvd & Garfield St" }, "geometry": { "type": "Point", "coordinates": [ -122.472281, 37.719575 ] } }
|
||||
{ "type": "Feature", "properties": { "name": "Junipero Serra Blvd & Garfield St" }, "geometry": { "type": "Point", "coordinates": [ -122.472239, 37.719575 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Ocean Ave & Cerritos Ave" }, "geometry": { "type": "Point", "coordinates": [ -122.466745, 37.727246 ] } }
|
||||
,
|
||||
@@ -3276,7 +3276,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Plymouth Ave & Mangels Ave" }, "geometry": { "type": "Point", "coordinates": [ -122.457647, 37.732100 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Monterey Blvd & Faxon Ave" }, "geometry": { "type": "Point", "coordinates": [ -122.459106, 37.730708 ] } }
|
||||
{ "type": "Feature", "properties": { "name": "Monterey Blvd & Faxon Ave" }, "geometry": { "type": "Point", "coordinates": [ -122.459064, 37.730708 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Plymouth Ave & Monterey Blvd" }, "geometry": { "type": "Point", "coordinates": [ -122.457519, 37.731116 ] } }
|
||||
,
|
||||
@@ -3342,7 +3342,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Plymouth Ave & Holloway Ave" }, "geometry": { "type": "Point", "coordinates": [ -122.456231, 37.721917 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Plymouth Ave & Holloway Ave" }, "geometry": { "type": "Point", "coordinates": [ -122.456059, 37.721747 ] } }
|
||||
{ "type": "Feature", "properties": { "name": "Plymouth Ave & Holloway Ave" }, "geometry": { "type": "Point", "coordinates": [ -122.456017, 37.721747 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Plymouth Ave & Grafton Ave" }, "geometry": { "type": "Point", "coordinates": [ -122.456231, 37.720118 ] } }
|
||||
,
|
||||
@@ -4372,7 +4372,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Hyde St & Union St" }, "geometry": { "type": "Point", "coordinates": [ -122.419152, 37.799171 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Union St & Hyde St" }, "geometry": { "type": "Point", "coordinates": [ -122.419152, 37.799137 ] } }
|
||||
{ "type": "Feature", "properties": { "name": "Union St & Hyde St" }, "geometry": { "type": "Point", "coordinates": [ -122.419152, 37.799103 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Hyde St & Green St" }, "geometry": { "type": "Point", "coordinates": [ -122.418938, 37.798357 ] } }
|
||||
,
|
||||
@@ -5284,7 +5284,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Avenue H & 5th St" }, "geometry": { "type": "Point", "coordinates": [ -122.367954, 37.822362 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Avenue H & 4th St" }, "geometry": { "type": "Point", "coordinates": [ -122.367783, 37.821955 ] } }
|
||||
{ "type": "Feature", "properties": { "name": "Avenue H & 4th St" }, "geometry": { "type": "Point", "coordinates": [ -122.367783, 37.821921 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Avenue H & California St" }, "geometry": { "type": "Point", "coordinates": [ -122.366409, 37.819955 ] } }
|
||||
,
|
||||
@@ -5438,7 +5438,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Grove St & Laguna St" }, "geometry": { "type": "Point", "coordinates": [ -122.426319, 37.777397 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Hayes St & Buchanan St" }, "geometry": { "type": "Point", "coordinates": [ -122.428293, 37.776278 ] } }
|
||||
{ "type": "Feature", "properties": { "name": "Hayes St & Buchanan St" }, "geometry": { "type": "Point", "coordinates": [ -122.428293, 37.776244 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Hayes St & Buchanan St" }, "geometry": { "type": "Point", "coordinates": [ -122.427564, 37.776244 ] } }
|
||||
,
|
||||
@@ -6456,7 +6456,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Townsend St & 4th St" }, "geometry": { "type": "Point", "coordinates": [ -122.394433, 37.777431 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "4th St & Townsend St" }, "geometry": { "type": "Point", "coordinates": [ -122.395120, 37.777126 ] } }
|
||||
{ "type": "Feature", "properties": { "name": "4th St & Townsend St" }, "geometry": { "type": "Point", "coordinates": [ -122.395120, 37.777092 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Townsend St & 4th St" }, "geometry": { "type": "Point", "coordinates": [ -122.394991, 37.777194 ] } }
|
||||
,
|
||||
@@ -7184,7 +7184,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Cesar Chavez St & Harrison St" }, "geometry": { "type": "Point", "coordinates": [ -122.411642, 37.748186 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "C. Chavez St&Harrison St" }, "geometry": { "type": "Point", "coordinates": [ -122.411385, 37.748356 ] } }
|
||||
{ "type": "Feature", "properties": { "name": "C. Chavez St&Harrison St" }, "geometry": { "type": "Point", "coordinates": [ -122.411385, 37.748322 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "name": "Cesar Chavez St & Alabama St" }, "geometry": { "type": "Point", "coordinates": [ -122.410440, 37.748424 ] } }
|
||||
,
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user