Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Draw Support for spatial filter for #1104 #1349

Merged
merged 1 commit into from
Dec 13, 2016
Merged

Add Draw Support for spatial filter for #1104 #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web/client/components/TOC/DefaultLayer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ var DefaultLayer = React.createClass({
<LayersTool key="toolquery"
tooltip="toc.searchFeatures"
className="toc-queryTool"
node={this.props.node}
ref="target"
style={{"float": "right", cursor: "pointer"}}
glyph="search"
Expand Down
23 changes: 19 additions & 4 deletions web/client/components/data/query/queryform.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@
/*****************************/
/* DRAWER MENU ***************/
/*****************************/
#mapstore-drawermenu #queryFormPanel .querypanel {
height: 100%;
max-height: 100%;
}
#mapstore-drawermenu #queryFormPanel .queryFormToolbar button:disabled{
color: gray;
}
Expand Down Expand Up @@ -72,6 +68,25 @@
margin-left: 3px;
margin-bottom: 3px;
}

/* Spatial Selector */
#mapstore-drawermenu #queryFormPanel .panel.details-panel {
width: auto;
height: auto;
}
#mapstore-drawermenu #queryFormPanel .details-panel .panel-body {
padding: 15px;
}
#mapstore-drawermenu #queryFormPanel .details-panel.panel{
border: 1px solid transparent;
border-radius: 4px;
-webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.5);
box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.5);
}
#mapstore-drawermenu #queryFormPanel .details-panel.panel-primary {
border-color: #078aa3;
}

/*****************************/
/* DRAWER MENU END ***********/
/*****************************/
Expand Down
1 change: 1 addition & 0 deletions web/client/localConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
"desktop": [{
"name": "Map",
"cfg": {
"tools": ["measurement", "locate", "overview", "scalebar", "draw", "highlight"],
"toolsOptions": {
"scalebar": {
"leaflet": {
Expand Down
2 changes: 1 addition & 1 deletion web/client/plugins/Map.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,5 +150,5 @@ const selector = createSelector(
);
module.exports = {
MapPlugin: connect(selector)(MapPlugin),
reducers: {}
reducers: { draw: require('../reducers/draw') }
};
4 changes: 2 additions & 2 deletions web/client/plugins/drawer/drawer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
}

#mapstore-drawermenu .panel {
border: none !important;
box-shadow: none !important;
border: none;
box-shadow: none;
}

div.nav-menu {
Expand Down