diff --git a/scripts/update_dependencies.sh b/scripts/update_dependencies.sh index 37811a4bc..2f7953c6f 100755 --- a/scripts/update_dependencies.sh +++ b/scripts/update_dependencies.sh @@ -18,13 +18,18 @@ VARIANT_TAG=v1.1.0 SOL_REPO="https://github.com/ThePhD/sol2.git" SOL_TAG=v2.15.8 +RAPIDJSON_REPO="https://github.com/miloyip/rapidjson.git" +RAPIDJSON_TAG=v1.1.0 + VARIANT_LATEST=$(curl "https://api.github.com/repos/mapbox/variant/releases/latest" | jq ".tag_name") OSMIUM_LATEST=$(curl "https://api.github.com/repos/osmcode/libosmium/releases/latest" | jq ".tag_name") SOL_LATEST=$(curl "https://api.github.com/repos/ThePhD/sol2/releases/latest" | jq ".tag_name") +RAPIDJSON_LATEST=$(curl "https://api.github.com/repos/miloyip/rapidjson/releases/latest" | jq ".tag_name") echo "Latest osmium release is $OSMIUM_LATEST, pulling in \"$OSMIUM_TAG\"" echo "Latest variant release is $VARIANT_LATEST, pulling in \"$VARIANT_TAG\"" echo "Latest sol2 release is $SOL_LATEST, pulling in \"$SOL_TAG\"" +echo "Latest rapidjson release is $RAPIDJSON_LATEST, pulling in \"$RAPIDJSON_TAG\"" read -p "Update osmium (y/n) " ok if [[ $ok =~ [yY] ]] @@ -56,4 +61,12 @@ then fi fi - +read -p "Update rapidjson (y/n) " ok +if [[ $ok =~ [yY] ]] +then + if [ -d "third_party/rapidjson" ]; then + git subtree pull -P third_party/rapidjson/ $RAPIDJSON_REPO $RAPIDJSON_TAG --squash + else + git subtree add -P third_party/rapidjson/ $RAPIDJSON_REPO $RAPIDJSON_TAG --squash + fi +fi diff --git a/test/data/tz/OGRGeoJSON.dbf b/test/data/tz/OGRGeoJSON.dbf deleted file mode 100644 index 0447c1deb..000000000 Binary files a/test/data/tz/OGRGeoJSON.dbf and /dev/null differ diff --git a/test/data/tz/OGRGeoJSON.prj b/test/data/tz/OGRGeoJSON.prj deleted file mode 100644 index a30c00a55..000000000 --- a/test/data/tz/OGRGeoJSON.prj +++ /dev/null @@ -1 +0,0 @@ -GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]] \ No newline at end of file diff --git a/test/data/tz/OGRGeoJSON.shp b/test/data/tz/OGRGeoJSON.shp deleted file mode 100644 index f501406da..000000000 Binary files a/test/data/tz/OGRGeoJSON.shp and /dev/null differ diff --git a/test/data/tz/OGRGeoJSON.shx b/test/data/tz/OGRGeoJSON.shx deleted file mode 100644 index 756ee549c..000000000 Binary files a/test/data/tz/OGRGeoJSON.shx and /dev/null differ