Skip to content

Commit

Permalink
Bump OnEarth version to 1.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jtroberts committed May 5, 2022
1 parent 9c2014a commit 412eead
Show file tree
Hide file tree
Showing 23 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion bin/build_el7_rpms_in_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ rm -f /build/dist/*bz2 /build/dist/*debug*
cp /build/dist/onearth-*.rpm /dist/
chown "${DOCKER_UID}:${DOCKER_GID}" /dist/onearth-*.rpm
cd /dist
tar -cvzf onearth-1.4.2-2.el7.tar.gz *.rpm
tar -cvzf onearth-1.4.3-1.el7.tar.gz *.rpm
EOS
chmod +x dist/build_rpms.sh
Expand Down
2 changes: 1 addition & 1 deletion bin/build_el8_rpms_in_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ rm -f /build/dist/*bz2 /build/dist/*debug*
cp /build/dist/onearth-*.rpm /dist/
chown "${DOCKER_UID}:${DOCKER_GID}" /dist/onearth-*.rpm
cd /dist
tar -cvzf onearth-1.4.2-2.el8.tar.gz *.rpm
tar -cvzf onearth-1.4.3-1.el8.tar.gz *.rpm
EOS
chmod +x dist/build_rpms.sh
Expand Down
6 changes: 3 additions & 3 deletions doc/docker_image_build.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ A Docker image that's configured to run OnEarth can be built using the **./bin/b

Example of building an OnEarth Docker image:

`./bin/build_el7_docker_image.sh nasagibs/onearth:1.4.2`
`./bin/build_el7_docker_image.sh nasagibs/onearth:1.4.3`

The generated image will start Apache when it is run.

Expand All @@ -20,6 +20,6 @@ takes two parameters:
* TAG - the tag to be applied to the newly generated image

Example of building an onearth-demo Docker image using the
"nasagibs/onearth:1.4.2":
"nasagibs/onearth:1.4.3":

`./bin/build_el7_demo_docker_image.sh nasagibs/onearth:1.4.2 onearth-demo:1.4.2`
`./bin/build_el7_demo_docker_image.sh nasagibs/onearth:1.4.3 onearth-demo:1.4.3`
2 changes: 1 addition & 1 deletion src/empty_tile/oe_generate_empty_tile.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import png

toolName = "oe_generate_empty_tile.py"
versionNumber = "v1.4.2"
versionNumber = "v1.4.3"

class ColorMap:
"""ColorMap metadata"""
Expand Down
2 changes: 1 addition & 1 deletion src/generate_legend/oe_generate_legend.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
ET.register_namespace("","http://www.w3.org/2000/svg")

toolName = "oe_generate_legend.py"
versionNumber = "v1.4.2"
versionNumber = "v1.4.3"

class ColorMaps:
"""Collection of ColorMaps"""
Expand Down
2 changes: 1 addition & 1 deletion src/layer_config/bin/oe_configure_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@

importlib.reload(sys)

versionNumber = '1.4.2'
versionNumber = '1.4.3'

class WMTSEndPoint:
"""End point data for WMTS"""
Expand Down
2 changes: 1 addition & 1 deletion src/modules/mod_oems/mod_oems.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

/*
* mod_oems.cpp: Mapserver wrapper module for OnEarth
* Version 1.4.2
* Version 1.4.3
*/

#include "mod_oems.h"
Expand Down
2 changes: 1 addition & 1 deletion src/modules/mod_oemstime/mod_oemstime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

/*
* mod_oemstime.cpp: OnEarth module for leveraging time snapping from Mapserver requests
* Version 1.4.2
* Version 1.4.3
*/

#include "mod_oemstime.h"
Expand Down
2 changes: 1 addition & 1 deletion src/modules/mod_oetwms/mod_oetwms.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

/*
* Tiled WMS cache module for Apache 2.0
* Version 1.4.2
* Version 1.4.3
*
* Lucian Plesea
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/mod_onearth/mod_onearth.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

/*
* OnEarth module for Apache 2.0
* Version 1.4.2
* Version 1.4.3
*
* Only takes server configuration, no point in doing directories,
* as these have to be read in for every request, negating the cache
Expand Down
2 changes: 1 addition & 1 deletion src/modules/mod_onearth/oe_create_cache_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@


// oe_create_cache_config.cpp : Defines the entry point for the console application.
// version 1.4.2
// version 1.4.3

// For windows, this file should exist but be empty on Linux
#include "stdafx.h"
Expand Down
2 changes: 1 addition & 1 deletion src/mrfgen/colormap2vrt.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
import xml.dom.minidom
from oe_utils import log_sig_exit, log_sig_err, log_sig_warn, log_info_mssg, log_info_mssg_with_timestamp, log_the_command, check_abs_path

versionNumber = '1.4.2'
versionNumber = '1.4.3'
colormap_filename = None

class ColorEntry:
Expand Down
2 changes: 1 addition & 1 deletion src/mrfgen/mrfgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
import functools
import random

versionNumber = '1.4.2'
versionNumber = '1.4.3'
oe_utils.basename = None
errors = 0

Expand Down
2 changes: 1 addition & 1 deletion src/mrfgen/oe_validate_palette.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
import re
from oe_utils import sigevent, log_sig_exit, log_sig_err, log_sig_warn, log_info_mssg, log_info_mssg_with_timestamp, log_the_command, check_abs_path

versionNumber = '1.4.2'
versionNumber = '1.4.3'
colormap_filename = None

class ColorEntry:
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/oe_configure_remote_layers.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
MAPFILE_TEMPLATE, WMS_LAYER_GROUP_TEMPLATE, DIMENSION_TEMPLATE, STYLE_TEMPLATE, VALIDATION_TEMPLATE


VERSION_NUMBER = '1.4.2'
VERSION_NUMBER = '1.4.3'
LAYER_NODE = '<Layer xmlns="http://www.opengis.net/wmts/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml">'
LAYER = ' <Layer>'
warnings = []
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/oe_configure_reproject_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
"""


versionNumber = '1.4.2'
versionNumber = '1.4.3'

def get_epsg_code_for_proj_string(proj_string):
# For some reason OSR can't parse this version of the 3857 CRS.
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/oe_validate_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
from parse_apache_configs import parse_config
from pyparsing import ParseException

versionNumber = '1.4.2'
versionNumber = '1.4.3'

# List of allowed directives
allowed_apache_directives = ["WMTSWrapperRole", "WMTSWrapperEnableTime", "WMTSWrapperMimeType", "Reproject_RegExp", "Reproject_ConfigurationFiles", "tWMS_RegExp", "tWMS_ConfigurationFile"]
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/read_idx.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import sys
import struct

versionNumber = '1.4.2'
versionNumber = '1.4.3'

#-------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion src/scripts/read_mrf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import struct
import math

versionNumber = '1.4.2'
versionNumber = '1.4.3'

#-------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion src/scripts/read_mrfdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import sys
import struct

versionNumber = '1.4.2'
versionNumber = '1.4.3'

#-------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion src/scripts/twmsbox2wmts.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def twmsbox2wmts(request_bbox, epsg):
return "TILECOL=" + str(abs(int(col))) + "\n" + "TILEROW="+str(abs(int(row)))


versionNumber = '1.4.2'
versionNumber = '1.4.3'
usageText = 'twmsbox2wmts.py --bbox [bbox]'

# Define command line options and args.
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/wmts2twmsbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def wmts2twmsbox_scale(scale_denominator, col, row):
return "Request BBOX: " + format(round(request_minx,10),'f')+","+format(round(request_miny,10),'f')+","+format(round(request_maxx,10),'f')+","+format(round(request_maxy,10),'f')


versionNumber = '1.4.2'
versionNumber = '1.4.3'
usageText = 'wmts2twmsbox.py --col [TILECOL] --row [TILEROW] --scale_denominator [value] OR --top_left_bbox [bbox]'

# Define command line options and args.
Expand Down
2 changes: 1 addition & 1 deletion src/vectorgen/oe_vectorgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
except:
sys.exit('ERROR: cannot find GDAL/OGR modules')

versionNumber = '1.4.2'
versionNumber = '1.4.3'
basename = None

def geojson2shp(in_filename, out_filename, source_epsg, target_epsg, sigevent_url):
Expand Down

0 comments on commit 412eead

Please sign in to comment.