Skip to content

Commit

Permalink
-- fixed actual extent bug
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiasstein committed Oct 26, 2015
1 parent 8180066 commit ab12e6c
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.conterra.devnet</groupId>
<artifactId>ct-mapapps-query-builder</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
<packaging>jar</packaging>
<!-- DISABLE repositories and pluginRepositories if inside the con terra! -->
<repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,16 @@ define([
_onDone: function () {
this._setProcessing(true);
var complexQuery = this._getComplexQuery();
var geom;
if(complexQuery.geometry) {
geom = complexQuery.geometry;
}
var customQueryString = JSON.stringify(complexQuery);
customQueryString = this.replacer.replace(customQueryString);
complexQuery = JSON.parse(customQueryString);
if(complexQuery.geometry) {
complexQuery["geometry"] = geom;
}
var store = this.store;
var options = {};
options.count = this.properties.options.count;
Expand Down
8 changes: 8 additions & 0 deletions src/main/js/bundles/dn_querybuilder/FilterQuery.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,17 @@ define([
});
window.show();
} else {
var geom;
if (customquery.geometry) {
geom = customquery.geometry;
}
var customQueryString = JSON.stringify(customquery);
customQueryString = this._replacer.replace(customQueryString);
customquery = JSON.parse(customQueryString);
var geom;
if (customquery.geometry) {
customquery["geometry"] = geom;
}
var options = {};
options.count = event.options.count;
options.ignoreCase = event.options.ignoreCase;
Expand Down
7 changes: 7 additions & 0 deletions src/main/js/bundles/dn_querybuilder/UserQueryBuilderWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,16 @@ define([
_onDone: function () {
this._setProcessing(true);
var complexQuery = this._getComplexQuery();
var geom;
if(complexQuery.geometry) {
geom = complexQuery.geometry;
}
var customQueryString = JSON.stringify(complexQuery);
customQueryString = this.replacer.replace(customQueryString);
complexQuery = JSON.parse(customQueryString);
if(complexQuery.geometry) {
complexQuery["geometry"] = geom;
}
var storeId = this._filteringSelect.get("value");
var store = this._getSelectedStore(storeId);
var filter = new Filter(store, complexQuery/*, {ignoreCase: true}*/);
Expand Down
3 changes: 3 additions & 0 deletions src/main/js/bundles/dn_querybuilder/config/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
},
{
"name": "wizard"
},
{
"name": "agssearch"
}
],
"CSS-Themes-Extension": [{
Expand Down
5 changes: 4 additions & 1 deletion src/main/js/bundles/dn_querybuilder/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Bundle-SymbolicName": "dn_querybuilder",
"Bundle-Version": "3.1.0",
"Bundle-Version": "3.1.1",
"Bundle-Name": "${bundleName}",
"Bundle-Description": "${bundleDescription}",
"Bundle-Vendor": "con terra GmbH",
Expand All @@ -15,6 +15,9 @@
},
{
"name": "notifier"
},
{
"name": "agssearch"
}
],
"CSS-Themes-Extension": [
Expand Down

0 comments on commit ab12e6c

Please sign in to comment.