Skip to content

Commit

Permalink
ベースをTerriaMap v0.0.8(terriajs v8.3.2に対応)にアップデート。
Browse files Browse the repository at this point in the history
  • Loading branch information
monomoti committed Oct 23, 2023
1 parent 9564b16 commit 66b77d9
Show file tree
Hide file tree
Showing 13 changed files with 1,947 additions and 5,504 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ wwwroot/doc/
wwwroot/index.html
npm-debug.log
version.js
version.json
wwwroot/init/nm.json
datasources/00_National_Data_Sets.json
.DS_Store
Expand Down
42 changes: 42 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,47 @@
# Change Log

### The Next Release

- [The next improvement]

### `0.0.8`

**2023-08-11**

- Updated TerriaJS to `8.3.2`.
- Now supports Google Analytics 4 properties.
- Upgraded babel packages
- See [the full list of changes](https://github.com/TerriaJS/terriajs/blob/main/CHANGES.md#832---2023-08-11).

### `0.0.7`

**2023-05-22**

- Update TerriaJS to `8.3.0`

- **Breaking changes:**

- **Upgraded Mobx to version 6.7.x**
- **Upgraded Typescript to version 4.9.x**

- Make `version.js` more detailed. It now uses format `${date}-${TerriaMap version}-${TerriaJS version}-${TerriaMap commit hash}`
- Also write out new `wwwroot/version.json` file - for example `{"date":"2022-11-11","terriajs":"8.2.21","terriamap":"0.0.6","terriamapCommitHash":"2d4d8d7d","hasLocalModifications":true}`

### `0.0.6`

**2022-11-11**

- About button href is now pulled from TerriaJS `configParameters.aboutButtonHrefUrl`
- Update TerriaJS to `8.2.21`

### `0.0.5`

**2022-11-02**

- TerriaMap no longer supports ejs templating for data sources. We suggest to use terria reference to manage a catalog in multiple files.
- Update TerriaJS to `8.2.20`
- Pin `"@types/lodash": "4.14.182"`(See https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/63021)

### `0.0.4`

**2022-09-23**
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2012-2019 CSIRO's Data61 and Contributors
Copyright 2012 CSIRO's Data61 and Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
30 changes: 30 additions & 0 deletions deploy/ecosystem-example.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*global __dirname*/
const os = require("os");
const path = require("path");

// You can start a production server with:
// pm2 start deploy/ecosystem-example.config.js --update-env --env production
// Or configure it to run automatically as a daemon (systemd, upstart, launchd, rcd) with:
// pm2 startup systemd

module.exports = {
apps: [
{
name: path.basename(path.resolve(__dirname, "..")) + "-production",
script: require.resolve("terriajs-server"),

// Add arguments to terriajs-server to the following, e.g. --port 4000
args: "--config-file productionserverconfig.json",
instances: Math.max(4, os.cpus().length),
autorestart: true,
watch: false,
max_memory_restart: "1G",
env: {
NODE_ENV: "development"
},
env_production: {
NODE_ENV: "production"
}
}
]
};
2 changes: 1 addition & 1 deletion deploy/helm/example-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ global:
rollingUpdate:
maxUnavailable: 1
image:
tag: "0.0.1"
tag: "0.0.6"
2 changes: 1 addition & 1 deletion deploy/helm/terria/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
description: "An open source geospatial data explorer"
name: "terria"
version: "0.0.1"
version: "0.1.0"
home: "https://github.com/TerriaJS/terriamap"
sources: ["https://github.com/TerriaJS/terriamap"]
4 changes: 2 additions & 2 deletions deploy/helm/terria/charts/terriamap/values.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
nodePort:
image:
#repository: data61/
#repository: ghcr.io/terriajs
#tag: latest
#full: terria-terrimap:1.0
#full: terrimap:0.0.6
pullPolicy: Always
clientConfig:
initializationUrls:
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/terria/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- if .Values.image.full -}}
{{ .Values.image.full | quote }}
{{- else -}}
"{{ .Values.image.repository | default .Values.global.image.repository }}/terria-{{ .Chart.Name }}:{{ .Values.image.tag | default .Values.global.image.tag | default "latest" }}"
"{{ .Values.image.repository | default .Values.global.image.repository }}/{{ .Chart.Name }}:{{ .Values.image.tag | default .Values.global.image.tag | default "latest" }}"
{{- end -}}
{{- end -}}
{{- end -}}
2 changes: 1 addition & 1 deletion deploy/helm/terria/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ global:
maxUnavailable: 0
exposeNodePorts: false
image:
repository: "data61"
repository: "ghcr.io/terriajs"
pullPolicy: Always
tags:
all:
Loading

0 comments on commit 66b77d9

Please sign in to comment.