Skip to content

Commit 9574884

Browse files
authored
Merge pull request #20 from KnowWhereGraph/gnis-fix
Gnis fix
2 parents 8c3cc6a + dc6ba28 commit 9574884

File tree

8 files changed

+31
-23
lines changed

8 files changed

+31
-23
lines changed

node-browser/angular.json

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@
4141
},
4242
"configurations": {
4343
"production": {
44+
"buildOptimizer": false,
45+
"optimization": false,
46+
"vendorChunk": true,
47+
"extractLicenses": false,
48+
"sourceMap": true,
49+
"namedChunks": true,
4450
"fileReplacements": [
4551
{
4652
"replace": "src/environments/environment.ts",
@@ -51,16 +57,27 @@
5157
{
5258
"type": "initial",
5359
"maximumWarning": "500kb",
54-
"maximumError": "2mb"
60+
"maximumError": "5mb"
5561
},
5662
{
5763
"type": "anyComponentStyle",
5864
"maximumWarning": "2kb",
59-
"maximumError": "2mb"
65+
"maximumError": "5mb"
6066
}
6167
],
6268
"outputHashing": "all"
6369
},
70+
"stko": {
71+
"buildOptimizer": true,
72+
"optimization": true,
73+
"extractLicenses": false,
74+
"fileReplacements": [
75+
{
76+
"replace": "src/environments/environment.ts",
77+
"with": "src/environments/environment.prod.ts"
78+
}
79+
]
80+
},
6481
"stage": {
6582
"buildOptimizer": false,
6683
"optimization": false,
@@ -95,34 +112,26 @@
95112
"serve": {
96113
"builder": "@angular-devkit/build-angular:dev-server",
97114
"configurations": {
98-
"prod": {
115+
"production": {
99116
"browserTarget": "node-browser:build:production"
100117
},
101118
"local": {
102119
"browserTarget": "node-browser:build:local"
103120
},
104121
"stage": {
105122
"browserTarget": "node-browser:build:stage"
123+
},
124+
"stko": {
125+
"browserTarget": "node-browser:build:stko"
106126
}
107127
},
108-
"defaultConfiguration": "prod"
128+
"defaultConfiguration": "stko"
109129
},
110130
"extract-i18n": {
111131
"builder": "@angular-devkit/build-angular:extract-i18n",
112132
"options": {
113133
"browserTarget": "node-browser:build"
114134
}
115-
},
116-
"test": {
117-
"builder": "@angular-devkit/build-angular:karma",
118-
"options": {
119-
"polyfills": "src/polyfills.ts",
120-
"tsConfig": "tsconfig.spec.json",
121-
"inlineStyleLanguage": "scss",
122-
"assets": ["src/favicon.ico", "src/assets"],
123-
"styles": ["src/styles.scss"],
124-
"scripts": []
125-
}
126135
}
127136
}
128137
}

node-browser/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ services:
33
build: '.'
44
volumes:
55
- ./dist/:/app/dist/
6-
entrypoint: ["ng","build","--configuration=production"]
6+
entrypoint: ["ng","build","--configuration=stko"]

node-browser/src/app/browse/browse.component.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ export class BrowseComponent implements OnInit {
150150
dataType: '',
151151
});
152152
}
153+
}
153154
// Check to see if the geometry can be sent to the map
154155
if (
155156
predicate.predicate.value ===
@@ -176,7 +177,6 @@ export class BrowseComponent implements OnInit {
176177
},
177178
});
178179
}
179-
}
180180
});
181181
},
182182
});
@@ -227,6 +227,9 @@ export class BrowseComponent implements OnInit {
227227
* @returns The full path of the URI
228228
*/
229229
private getFullNodePath(uri: string) {
230+
if(uri.includes("gnis")) {
231+
return uri
232+
}
230233
let prefix = uri.split(':')[0];
231234
let val = this.queryService.prefixes[prefix];
232235
return uri.replace(prefix.concat(':'), val);
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export const environment = {
22
baseAddress: 'localhost/',
33
graphEndpoint: 'https://localhost/sparql',
4-
production: false,
54
};
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export const environment = {
22
baseAddress: 'https://stko-kwg.geog.ucsb.edu/',
33
graphEndpoint: 'https://stko-kwg.geog.ucsb.edu/sparql',
4-
production: true,
54
};
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export const environment = {
22
baseAddress: 'https://staging.knowwheregraph.org/',
33
graphEndpoint: 'https://staging.knowwheregraph.org/sparql',
4-
production: false,
54
};

node-browser/src/environments/environment.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
export const environment = {
66
baseAddress: 'https://staging.knowwheregraph.org/',
7-
graphEndpoint: 'https://staging.knowwheregraph.org/sparql',
8-
production: false,
7+
graphEndpoint: 'https://staging.knowwheregraph.org/sparql'
98
};
109

1110
/*

node-browser/src/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<title>NodeBrowser</title>
5+
<title>Node Browser</title>
66
<base href="/" />
77
<meta name="viewport" content="width=device-width, initial-scale=1" />
88
<link rel="icon" type="image/x-icon" href="favicon.ico" />

0 commit comments

Comments
 (0)