-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #837 from theduckylittle/feature/keep-measure-tool…
…-features Measure Tool Enhancements
- Loading branch information
Showing
25 changed files
with
846 additions
and
133 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2023 Dan "Ducky" Little | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| import React from "react"; | ||
|
|
||
| export const LineIcon = ({ width, height, padding, outline, stroke }) => { | ||
| const points = [0, 0, width, height].join(" "); | ||
|
|
||
| return ( | ||
| <svg | ||
| viewBox={`${-1 * padding} ${-1 * padding} ${width + padding * 2} ${ | ||
| height + padding * 2 | ||
| }`} | ||
| height={height} | ||
| width={width} | ||
| > | ||
| <polyline | ||
| points={points} | ||
| className="line-icon" | ||
| style={{ | ||
| stroke: outline, | ||
| strokeWidth: 7, | ||
| strokeLineCap: "round", | ||
| }} | ||
| /> | ||
| <polyline | ||
| points={points} | ||
| className="line-icon" | ||
| style={{ | ||
| stroke: stroke, | ||
| strokeWidth: 3, | ||
| }} | ||
| /> | ||
| </svg> | ||
| ); | ||
| }; | ||
|
|
||
| LineIcon.defaultProps = { | ||
| width: 32, | ||
| height: 32, | ||
| padding: 5, | ||
| outline: "#ffffff", | ||
| stroke: "#0099ff", | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2023 Dan "Ducky" Little | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| import { Circle, Fill, Style, Stroke } from "ol/style"; | ||
| import { | ||
| createLayer as createVectorLayer, | ||
| updateLayer as updateVectorLayer, | ||
| } from "./vector"; | ||
|
|
||
| const applyMeasureStyle = (layer, mapSource, mapTool) => { | ||
| layer.setStyle((feature) => { | ||
| const { outlineColor, coreColor } = feature.getProperties(); | ||
|
|
||
| if (feature.getGeometry().getType() === "Point") { | ||
| return new Style({ | ||
| image: new Circle({ | ||
| radius: 7, | ||
| fill: new Fill({ | ||
| color: coreColor, | ||
| }), | ||
| stroke: new Stroke({ | ||
| color: outlineColor, | ||
| width: 3, | ||
| }), | ||
| }), | ||
| }); | ||
| } | ||
|
|
||
| return [ | ||
| new Style({ | ||
| stroke: new Stroke({ | ||
| color: outlineColor, | ||
| width: 7, | ||
| }), | ||
| }), | ||
| new Style({ | ||
| stroke: new Stroke({ | ||
| color: coreColor, | ||
| width: 3, | ||
| }), | ||
| }), | ||
| ]; | ||
| }); | ||
| }; | ||
|
|
||
| export const createLayer = (mapSource) => { | ||
| return createVectorLayer(mapSource, applyMeasureStyle); | ||
| }; | ||
|
|
||
| export const updateLayer = (map, layer, mapSource, mapTool) => { | ||
| return updateVectorLayer(map, layer, mapSource, mapTool, applyMeasureStyle); | ||
| }; |
Oops, something went wrong.