Skip to content
This repository was archived by the owner on Apr 22, 2022. It is now read-only.

Commit 2442d1e

Browse files
committed
add fagi required fields
1 parent 34e2d67 commit 2442d1e

File tree

4 files changed

+22
-21
lines changed

4 files changed

+22
-21
lines changed

CHANGES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
release date=11:13 30.10.2015,version=1.2.1,urgency=low,by=Alejandra Garcia-Rojas M <[email protected]>,distribution=ldstack-nightly
2-
* Allow big files for TirpleGeo
2+
* Allow big files for TirpleGeo

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
<artifactId>tomcat7-maven-plugin</artifactId>
214214
<version>2.2</version>
215215
<configuration>
216-
<server>localhost</server>
216+
<server>generator</server>
217217
<url>${tomcat.deploy.url}</url>
218218
<path>/${project.build.finalName}</path>
219219
<update>true</update>

src/main/webapp/js/workbench/extraction-and-loading/triplegeo-controller.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -418,12 +418,12 @@ var TripleGeoCtrl = function($scope, $http, $q, ConfigurationService, Components
418418
format : $scope.options.format[0],
419419
targetStore : $scope.options.targetStore[0],
420420

421-
featureString: name,
422-
attribute: "",
421+
featureString: fileName.substring(0,fileName.length-4).toLowerCase(),
422+
attribute: "name",
423423
ignore: "UNK",
424424
type: "",
425-
name: "",
426-
uclass: "",
425+
name: "id",
426+
uclass: "type",
427427

428428
nsPrefix: "gkg",
429429
nsURI: ConfigurationService.getUriBase(),
@@ -499,8 +499,8 @@ var TripleGeoCtrl = function($scope, $http, $q, ConfigurationService, Components
499499
name: $scope.tripleGeoConfig.name,
500500
uclass: $scope.tripleGeoConfig.uclass,
501501

502-
nsPrefix: "gkg",
503-
nsURI: ConfigurationService.getUriBase(),
502+
nsPrefix: "gkg",
503+
nsURI: ConfigurationService.getUriBase(),
504504

505505
ontologyNSPrefix: $scope.tripleGeoConfig.ontologyNSPrefix,
506506
ontologyNS: $scope.tripleGeoConfig.ontologyNS,

src/main/webapp/js/workbench/extraction-and-loading/triplegeo.html

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,11 @@ <h5 class="green bold">TripleGeo Configuration</h5>
148148
<label class="green bold">Feature String</label>
149149
</div>
150150
<div class="input-group-sm col-xs-4">
151-
<select ng-model="tripleGeoConfig.featureString" class="form-control" ng-options="option for option in options.esriFeature" ></select>
151+
{{tripleGeoConfig.featureString}}
152152
</div>
153+
153154
<div class="col-xs-2">
154-
<label class="green bold">Attribute</label>
155+
<label class="green bold">Attribute *</label>
155156
</div>
156157
<div class="input-group-sm col-xs-4">
157158
<input class="form-control" ng-model="tripleGeoConfig.attribute"></input>
@@ -160,35 +161,35 @@ <h5 class="green bold">TripleGeo Configuration</h5>
160161
<br>
161162
<div class="row">
162163
<div class="col-xs-2">
163-
<label class="green bold">Ignore</label>
164+
<label class="green bold">Ignore *</label>
164165
</div>
165166
<div class="input-group-sm col-xs-4">
166-
<input class="form-control" ng-model="tripleGeoConfig.ignore"></input>
167+
<input class="form-control" ng-model="tripleGeoConfig.ignore" required></input>
167168
</div>
168169
<div class="col-xs-2">
169-
<label class="green bold">Type</label>
170+
<label class="green bold">Type *</label>
170171
</div>
171172
<div class="input-group-sm col-xs-4">
172-
<input class="form-control" ng-model="tripleGeoConfig.type"></input>
173+
<input class="form-control" ng-model="tripleGeoConfig.type" required></input>
173174
</div>
174175
</div>
175176
<br>
176177
<div class="row">
177178
<div class="col-xs-2">
178-
<label class="green bold">Name</label>
179+
<label class="green bold">Name *</label>
179180
</div>
180181
<div class="input-group-sm col-xs-4">
181-
<input class="form-control" ng-model="tripleGeoConfig.name"></input>
182+
<input class="form-control" ng-model="tripleGeoConfig.name" required></input>
182183
</div>
183184
<div class="col-xs-2">
184-
<label class="green bold">Class</label>
185+
<label class="green bold">Class *</label>
185186
</div>
186187
<div class="input-group-sm col-xs-4">
187-
<input class="form-control" ng-model="tripleGeoConfig.dclass"></input>
188+
<input class="form-control" ng-model="tripleGeoConfig.uclass" required></input>
188189
</div>
189190
</div>
190191
<br>
191-
192+
* required
192193
</div>
193194
<div ng-show="options.dbParams">
194195
<div class="row">
@@ -318,13 +319,13 @@ <h5 class="green bold">TripleGeo Configuration</h5>
318319
<div class="col-xs-2">
319320
<label class="green bold">Source</label>
320321
</div>
321-
<div class="input-group-sm col-xs-2">
322+
<div class="input-group-sm col-xs-4">
322323
<input class="form-control" ng-model="tripleGeoConfig.sourceRS"></input>
323324
</div>
324325
<div class="col-xs-2">
325326
<label class="green bold">Target</label>
326327
</div>
327-
<div class="input-group-sm col-xs-2">
328+
<div class="input-group-sm col-xs-4">
328329
<input class="form-control" ng-model="tripleGeoConfig.targetRS"></input>
329330
</div>
330331
</div>

0 commit comments

Comments
 (0)