Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
ProgGis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Severin Steffensen Hjelseth
ProgGis
Commits
b7537b83
Commit
b7537b83
authored
1 year ago
by
Jakob Severin Steffensen Hjelseth
Browse files
Options
Downloads
Patches
Plain Diff
Begynne å nøste opp i problemet
parent
a65f91d7
No related branches found
No related tags found
1 merge request
!68
Resolve "Input Polygon"
Pipeline
#238943
passed
1 year ago
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
javascript/buffer.js
+2
-6
2 additions, 6 deletions
javascript/buffer.js
javascript/turfFormatConverter.js
+18
-2
18 additions, 2 deletions
javascript/turfFormatConverter.js
with
20 additions
and
8 deletions
javascript/buffer.js
+
2
−
6
View file @
b7537b83
...
...
@@ -32,19 +32,16 @@ function makeBuffer() {
var
name
=
document
.
getElementById
(
"
bufferName
"
).
value
;
// Prøver å kjøre buffer-funksjonen:
var
buffer
=
turf
.
buffer
(
layer
,
distance
,
{
units
:
"
meters
"
});
// Lager buffer
console
.
log
(
JSON
.
stringify
(
buffer
));
/*
try
{
var
buffer
=
turf
.
buffer
(
layer
,
distance
,
{
units
:
"
meters
"
});
// Lager buffer
if
(
document
.
getElementById
(
"
bufferCheck
"
).
checked
)
{
// Om en har huket av for at en skal 'dissolve' gjøres det
// Dette er nytt
console
.
log
(
JSON
.
stringify
(
buffer
));
/*
if (isMultiPolygon(buffer)) { // Kan ikke sende MultiPolygon inn i dissolved
if
(
isMultiPolygon
(
buffer
))
{
// Kan ikke sende MultiPolygon inn i dissolved
buffer
=
multiPolygonToFeatureCollection
(
buffer
);
}
// #
var
dissolved
=
turf
.
dissolve
(
buffer
);
var
newLayer
=
L
.
geoJSON
(
dissolved
,
{
style
:
getStyle
()});
}
else
{
// Ellers lager den bare mange ulike buffer-soner
...
...
@@ -61,5 +58,4 @@ function makeBuffer() {
}
catch
(
failure
)
{
// Hvis det ikke går å lage buffer, sendes det en feilmelding
alert
(
failure
);
}
*/
}
This diff is collapsed.
Click to expand it.
javascript/turfFormatConverter.js
+
18
−
2
View file @
b7537b83
...
...
@@ -17,8 +17,24 @@ function featureCollectionToMultiPolygon(layer) { // Funksjon som gjør om featu
}
function
isMultiPolygon
(
layer
)
{
// Inneholder 'layer' features som er MultiPolygon?
if
(
layer
[
"
geometry
"
][
"
type
"
]
==
"
MultiPolygon
"
)
{
return
true
;
more
=
false
;
try
{
if
(
layer
[
"
features
"
])
{
more
=
true
;
}
}
catch
{}
if
(
more
)
{
for
(
var
i
=
0
;
i
<
layer
[
"
features
"
].
length
;
i
++
)
{
if
(
layer
[
"
features
"
][
i
][
"
geometry
"
][
"
type
"
]
==
"
MultiPolygon
"
)
{
return
true
;
}
}
}
else
{
if
(
layer
[
"
geometry
"
][
"
type
"
]
==
"
MultiPolygon
"
)
{
return
true
;
}
}
return
false
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment