try to merge with master..

.dockerignore

@@ -0,0 +1 @@
+/insar

.gitignore

@@ -107,3 +107,6 @@ venv.bak/
 
 /error_log
 .idea/
+/insar
+.DS_Store
+

ChangeLog.md

@@ -1,3 +1,6 @@
+## 2024-09-04  Mei-Hui Su <[email protected]> 
+* New Statewide styling <[email protected]>
+
 ## 2023-01-20  Mei-Hui Su <[email protected]>
 * looking to add
 

Dockerfile-postgis

@@ -1,6 +1,6 @@
 FROM mdillon/postgis:10-alpine
 ENV POSTGRES_USER postgres
-ENV POSTGRES_DB CGM1_db
+ENV POSTGRES_DB CGM_db
 ENV PGDATA=/home/postgres/cgm_db
 
 WORKDIR /app

Dockerfile-web

@@ -11,7 +11,7 @@ RUN yum install -y httpd && \
 
 ## python/hdf5
 
-RUN yum install -y tar mkdir sudo which git wget openblas yum-utils gcc make 
+RUN yum install -y tar mkdir sudo which git wget gtar openblas yum-utils gcc make
 RUN yum install -y zlib-devel openssl11-devel libffi-devel
 
 RUN cd /app/misc; tar zxvf cpython-3.8.11.tar.gz;cd cpython-3.8.11; ./configure --prefix=/usr/local/python-3.8.11; make; make install
@@ -20,21 +20,20 @@ RUN sudo ln -s /usr/local/python-3.8.11/bin/python3.8 /usr/bin/python3
 RUN python3 -m pip install setuptools wheel numpy netCDF4 
 
 ## build hdf5
-RUN amazon-linux-extras install -y epel
-RUN yum install –y epel-release
-RUN yum-config-manager --enable epel
-RUN yum install -y hdf5-devel
-
-RUN python3 -m pip install h5py
+RUN amazon-linux-extras install -y epel && \
+yum install –y epel-release && \
+yum-config-manager --enable epel && \
+yum install -y hdf5-devel && \
+python3 -m pip install h5py
 
 ## bring in the insar track data
-RUN cd /app/web/cgm_data && \
-    mkdir -p insar && \
-    cd insar && \
-    wget -nv https://g-c662a6.a78b8.36fe.data.globus.org/cxm/models/cgm/insar/D071_COMB_CGM_InSAR_v0_0_1.hdf5 && \
-    wget -nv https://g-c662a6.a78b8.36fe.data.globus.org/cxm/models/cgm/insar/A166_COMB_CGM_InSAR_v0_0_1.hdf5 && \
-    wget -nv https://g-c662a6.a78b8.36fe.data.globus.org/cxm/models/cgm/insar/A064_COMB_CGM_InSAR_v0_0_1.hdf5 && \
-    wget -nv https://g-c662a6.a78b8.36fe.data.globus.org/cxm/models/cgm/insar/D173_COMB_CGM_InSAR_v0_0_1.hdf5
+# RUN cd /app/web/cgm_data && \
+#     mkdir -p insar && \
+#     cd insar && \
+#     wget -nv https://files.scec.org/s3fs-public/projects/cgm/2.0.0/data/cgm-v2.0.0-insar.tar.gz && \
+#     gtar -zxvf cgm-v2.0.0-insar.tar.gz
+
+#ADD https://files.scec.org/s3fs-public/projects/cgm/2.0.0/data/cgm-v2.0.0-insar.tar.gz /app/web/cgm_data
 
 RUN cd /app && \
     git clone https://github.com/kmaterna/InSAR_CGM_readers_writers.git && \

README.md

@@ -1,18 +1,24 @@
-# ~~Community Geodetic Model~~
- _TODO: Write new documentation,
-
-### https://www.scec.org/research/cgm
+[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/SCECcode/CGM_web/blob/master/LICENSE.md)
 
-##CGM viewer
+# CGM Explorer
 
- _TODO: Write new documentation
+## Community Geodetic Model (CGM)
 
-### Screen Capture
+A 2D Explorer based on Leaflet, an open-source JavaScript library for interactive maps,
+https://leafletjs.com, map data services from OpenStreetMap, https://www.openstreetmap.org,
+OpenTopoMap, https://www.opentopomap.org and leaflet esri plugin,
+https://esri.github.io/esri-leaflet, for Ersi basemap from ArcGIS and 2D time series plots
+based on Plotly.js, a high-level delarative charting library.
+
+## Community Geodetic Model
 
-Website URL: TBD
+The Community Geodetic Model (CGM) provides displacement time series and velocities of the Earth’s surface over southern California using data from Global Navigation Satellite Systems (GNSS), which includes the Global Positioning System (GPS), and interferometric synthetic aperture radar (InSAR), both space-based geodetic observation techniques.
 
-![](doc/cgm_demo.jpg) 
+### https://www.scec.org/research/cgm
+
+### Screen Capture
 
+![](web/img/cgm-explorer.jpg) 
 
 ## CGM data service
 
@@ -43,13 +49,15 @@ Deployment is accomplished using [Docker](https://docs.docker.com/) with [docker
 
 #### Development Deployment
 1. Run: `docker-compose -f docker-compose.yml -f development.yml up -d`
-2. After the build is complete, browse to http://localhost:8084
-3. The development.yml maps the code directory to the container for easy code development and exposes port 5432 for directly accessing the Postgres database.
+2. Run: `./load_insar.sh`
+3. After the build is complete, browse to http://localhost:8084
+4. The development.yml maps the code directory to the container for easy code development and exposes port 5432 for directly accessing the Postgres database.
 
 #### Production Deployment
 1. Run: `docker-compose -f docker-compose.yml up -d`
-2. After build is complete, browse to http://server-name:8084
-3. Optionally, set up a reverse proxy from a URL on an existing web server to localhost:8084.
+2. Run: `./load_insar.sh`
+3. After build is complete, browse to http://server-name:8084
+4. Optionally, set up a reverse proxy from a URL on an existing web server to localhost:8084.
 
 ### Layout 
 

doc/cgm.conf

@@ -11,6 +11,7 @@ Listen 8081
     RewriteRule ^guide$ guide.php [L]
     RewriteRule ^contact$ contact.php [L]
     RewriteRule ^disclaimer$ disclaimer.php [L]
+    RewriteRule ^cite$ how-to-cite.php [L]
 </Directory>
 
 <VirtualHost *:8081>

docker-compose.yml

@@ -17,6 +17,8 @@ services:
       dockerfile: Dockerfile-web
       context: ./
     restart: always
+    volumes: 
+      - ./insar:/app/web/cgm_data/insar
     ports:
       - 8081:8081
       - 8080:80

load_insar.sh

@@ -0,0 +1,9 @@
+#/bin/bash
+
+mkdir -p insar
+cd insar
+wget https://files.scec.org/s3fs-public/projects/cgm/2.0.0/data/cgm-v2.0.0-insar.tar.gz
+tar xvf cgm-v2.0.0-insar.tar.gz
+cd ..
+mv insar web/cgm_data
+chmod og+rw web/result

run_build

@@ -0,0 +1,6 @@
+docker rmi $(docker images -f dangling=true -q ) -f
+docker-compose -f docker-compose-localhost.yml -f development.yml down
+docker system prune -a -f --volumes
+docker-compose -f docker-compose-localhost.yml -f development.yml up --build --force -d
+./load_insar.sh
+

run_connect

@@ -1,4 +1,8 @@
-docker container exec -it cgm_web_web_1 /bin/bash
 
+pid=`docker ps | grep cgm_web_web | cut -f 1 -d ' '`
+
+docker container exec -it $pid /bin/bash
+
+## psql -U postgres -d CGM_db