Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gitc-6709: Add support for creating UV tiles from Oscar data #188

Closed
wants to merge 3 commits into from
Closed

Gitc-6709: Add support for creating UV tiles from Oscar data #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1685f9
Added a script for converting GeoJSON to UV tiles for vector flow vis…
jackiryan Feb 6, 2025
b86a64b
Added unit tests and test/ref data
jackiryan Feb 10, 2025
acfab9f
Added more unit tests for oe_json_to_uvtile, fixed reference
jackiryan Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 27 additions & 26 deletions docker/test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ ENV GDAL_VERSION=$GDAL_VERSION

# Install dependencies
RUN dnf install -y \
proj-8.2.0 \
proj-devel-8.2.0 \
geos-3.10.1 \
fribidi-devel-1.0.10 \
cairo-devel-1.17.4 \
cmake-3.26.5 \
geos-devel-3.10.1 \
harfbuzz-devel-2.7.4 \
fcgi-devel-2.4.0 \
protobuf-c-devel-1.3.3 && \
dnf clean all
proj-8.2.0 \
proj-devel-8.2.0 \
geos-3.10.1 \
fribidi-devel-1.0.10 \
cairo-devel-1.17.4 \
cmake-3.26.5 \
geos-devel-3.10.1 \
harfbuzz-devel-2.7.4 \
fcgi-devel-2.4.0 \
protobuf-c-devel-1.3.3 && \
dnf clean all

# libspatialindex
WORKDIR /tmp
Expand All @@ -38,21 +38,21 @@ RUN wget http://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION}.tar
mkdir build && \
cd build && \
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=/usr/local/ \
-DCMAKE_INSTALL_PREFIX=/usr/local/ \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_TESTING=OFF \
-DGDAL_USE_PARQUET=OFF \
-DGDAL_USE_ARROW=OFF \
-DGDAL_USE_ARROWDATASET=OFF \
-DGDAL_ENABLE_HDF5_GLOBAL_LOCK:BOOL=ON \
-DBRUNSLI_INCLUDE_DIR=/usr/local/include/brunsli \
-DGDAL_USE_BRUNSLI=ON \
-DBUILD_PYTHON_BINDINGS:BOOL=ON \
-DBUILD_JAVA_BINDINGS:BOOL=OFF \
-DBUILD_CSHARP_BINDINGS:BOOL=OFF \
.. && \
-DCMAKE_PREFIX_PATH=/usr/local/ \
-DCMAKE_INSTALL_PREFIX=/usr/local/ \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_TESTING=OFF \
-DGDAL_USE_PARQUET=OFF \
-DGDAL_USE_ARROW=OFF \
-DGDAL_USE_ARROWDATASET=OFF \
-DGDAL_ENABLE_HDF5_GLOBAL_LOCK:BOOL=ON \
-DBRUNSLI_INCLUDE_DIR=/usr/local/include/brunsli \
-DGDAL_USE_BRUNSLI=ON \
-DBUILD_PYTHON_BINDINGS:BOOL=ON \
-DBUILD_JAVA_BINDINGS:BOOL=OFF \
-DBUILD_CSHARP_BINDINGS:BOOL=OFF \
.. && \
cmake --build . && \
cmake --build . --config Release --target install && \
export LD_LIBRARY_PATH=:/usr/local/lib && \
Expand Down Expand Up @@ -206,6 +206,7 @@ RUN install -m 755 src/empty_tile/oe_generate_empty_tile.py -D /usr/bin/oe_gener
install -m 755 src/colormaps/bin/SLDtoColorMap.py -D /usr/bin/SLDtoColorMap.py && \
install -m 755 src/vectorgen/oe_vectorgen.py -D /usr/bin/oe_vectorgen && \
install -m 755 src/vectorgen/oe_create_mvt_mrf.py -D /usr/bin/oe_create_mvt_mrf.py && \
install -m 755 src/vectorgen/oe_json_to_uvtile.py -D /usr/bin/oe_json_to_uvtile && \
install -m 755 src/scripts/oe_sync_s3_idx.py -D /usr/bin/oe_sync_s3_idx.py && \
install -m 755 src/scripts/oe_sync_s3_configs.py -D /usr/bin/oe_sync_s3_configs.py && \
install -m 755 src/scripts/oe_sync_s3_shapefiles.py -D /usr/bin/oe_sync_s3_shapefiles.py && \
Expand Down
83 changes: 42 additions & 41 deletions docker/tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,33 @@ RUN dnf -y update && \
dnf groupinstall -y "Development Tools" && \
dnf clean all && \
dnf config-manager --set-enabled crb && \
dnf install -y epel-release-9-5.el9 && \
dnf install -y epel-release-9-5.el9 && \
dnf install -y \
lua-devel-5.4.4 \
jansson-devel-2.14 \
libpng-devel-1.6.37 \
pcre-devel-8.44 \
wget-1.21.1 \
libyaml-devel-0.2.5 \
libcurl-devel-7.76.1 \
libjpeg-turbo-devel-2.0.90 \
libxml2-devel-2.9.13 \
luarocks-3.9.2 \
redis-6.2.7 \
cronie-1.5.7 \
logrotate-3.18.0 \
fribidi-devel-1.0.10 \
cairo-devel-1.17.4 \
cmake-3.26.5 \
harfbuzz-devel-2.7.4 \
fcgi-devel-2.4.0 \
proj-8.2.0 \
proj-devel-8.2.0 \
geos-3.10.1 \
geos-devel-3.10.1 \
python3-devel-3.9.18 \
protobuf-c-devel-1.3.3 && \
dnf clean all
lua-devel-5.4.4 \
jansson-devel-2.14 \
libpng-devel-1.6.37 \
pcre-devel-8.44 \
wget-1.21.1 \
libyaml-devel-0.2.5 \
libcurl-devel-7.76.1 \
libjpeg-turbo-devel-2.0.90 \
libxml2-devel-2.9.13 \
luarocks-3.9.2 \
redis-6.2.7 \
cronie-1.5.7 \
logrotate-3.18.0 \
fribidi-devel-1.0.10 \
cairo-devel-1.17.4 \
cmake-3.26.5 \
harfbuzz-devel-2.7.4 \
fcgi-devel-2.4.0 \
proj-8.2.0 \
proj-devel-8.2.0 \
geos-3.10.1 \
geos-devel-3.10.1 \
python3-devel-3.9.18 \
protobuf-c-devel-1.3.3 && \
dnf clean all

# libspatialindex
WORKDIR /tmp
Expand Down Expand Up @@ -71,21 +71,21 @@ RUN wget http://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION}.tar
mkdir build && \
cd build && \
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=/usr/local/ \
-DCMAKE_INSTALL_PREFIX=/usr/local/ \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_TESTING=OFF \
-DGDAL_USE_PARQUET=OFF \
-DGDAL_USE_ARROW=OFF \
-DGDAL_USE_ARROWDATASET=OFF \
-DGDAL_ENABLE_HDF5_GLOBAL_LOCK:BOOL=ON \
-DBRUNSLI_INCLUDE_DIR=/usr/local/include/brunsli \
-DGDAL_USE_BRUNSLI=ON \
-DBUILD_PYTHON_BINDINGS:BOOL=ON \
-DBUILD_JAVA_BINDINGS:BOOL=OFF \
-DBUILD_CSHARP_BINDINGS:BOOL=OFF \
.. && \
-DCMAKE_PREFIX_PATH=/usr/local/ \
-DCMAKE_INSTALL_PREFIX=/usr/local/ \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_TESTING=OFF \
-DGDAL_USE_PARQUET=OFF \
-DGDAL_USE_ARROW=OFF \
-DGDAL_USE_ARROWDATASET=OFF \
-DGDAL_ENABLE_HDF5_GLOBAL_LOCK:BOOL=ON \
-DBRUNSLI_INCLUDE_DIR=/usr/local/include/brunsli \
-DGDAL_USE_BRUNSLI=ON \
-DBUILD_PYTHON_BINDINGS:BOOL=ON \
-DBUILD_JAVA_BINDINGS:BOOL=OFF \
-DBUILD_CSHARP_BINDINGS:BOOL=OFF \
.. && \
cmake --build . && \
cmake --build . --config Release --target install && \
export LD_LIBRARY_PATH=:/usr/local/lib && \
Expand Down Expand Up @@ -152,6 +152,7 @@ RUN install -m 755 src/empty_tile/oe_generate_empty_tile.py -D /usr/bin/oe_gener
install -m 755 src/colormaps/bin/SLDtoColorMap.py -D /usr/bin/SLDtoColorMap.py && \
install -m 755 src/vectorgen/oe_vectorgen.py -D /usr/bin/oe_vectorgen && \
install -m 755 src/vectorgen/oe_create_mvt_mrf.py -D /usr/bin/oe_create_mvt_mrf.py && \
install -m 755 src/vectorgen/oe_json_to_uvtile.py -D /usr/bin/oe_json_to_uvtile && \
install -m 755 src/scripts/oe_sync_s3_idx.py -D /usr/bin/oe_sync_s3_idx.py && \
install -m 755 src/scripts/oe_sync_s3_configs.py -D /usr/bin/oe_sync_s3_configs.py && \
install -m 755 src/scripts/oe_sync_s3_shapefiles.py -D /usr/bin/oe_sync_s3_shapefiles.py && \
Expand Down
Loading