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.
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
Some new features #67
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
2735745
Added disable feature support
simonseyock 10867a9
Removed problematic naming of setMap method on layers
simonseyock 6fb7492
Removed opacity property of features. Use cloneStyle and adjustOpacit…
simonseyock 1406d5d
prevent click selection events if not clicked on canvas
simonseyock bc7cc88
Fixed timeouts
simonseyock 43bb060
New openlayers version
simonseyock 8bfd278
Removed Comment
simonseyock File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
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
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 |
---|---|---|
@@ -1,29 +1,9 @@ | ||
import ol from 'openlayers' | ||
|
||
import BaseLayerMixin from './BaseLayerMixin' | ||
import LayerLoadProcessCountMixin from './LayerLoadProcessCountMixin' | ||
import {BaseLayerMixin} from './BaseLayerMixin' | ||
import {LayerLoadProcessCountMixin} from './LayerLoadProcessCountMixin' | ||
import { mixin } from '../utilities' | ||
import {ProvideMapMixin} from './ProvideMapMixin' | ||
|
||
export default class BaseLayerTile extends mixin(mixin(ol.layer.Tile, BaseLayerMixin), LayerLoadProcessCountMixin) { | ||
/** | ||
* @param {G4UMap} map | ||
*/ | ||
setMap (map) { | ||
/** | ||
* WORKAROUND | ||
* As openlayers identifies managed layers (i.e. layers that are registered via the maps addLayer function) | ||
* by the fact that the setMap method was called and we need a reference to the map in layers contained in a | ||
* grouplayer, we overwrite the setMap method to still have access to the map via the normal way | ||
* @type {G4UMap} | ||
* @private | ||
*/ | ||
this.map__ = map | ||
} | ||
|
||
/** | ||
* @returns {G4UMap} | ||
*/ | ||
getMap () { | ||
return this.map__ | ||
} | ||
} | ||
export const BaseLayerTile = | ||
mixin(mixin(mixin(ol.layer.Tile, ProvideMapMixin), BaseLayerMixin), LayerLoadProcessCountMixin) |
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 |
---|---|---|
@@ -1,34 +1,10 @@ | ||
import ol from 'openlayers' | ||
|
||
import LayerLoadProcessCountMixin from './LayerLoadProcessCountMixin' | ||
import BaseLayerMixin from './BaseLayerMixin' | ||
import {LayerLoadProcessCountMixin} from './LayerLoadProcessCountMixin' | ||
import {BaseLayerMixin} from './BaseLayerMixin' | ||
import { mixin } from '../utilities' | ||
import {ProvideMapMixin} from './ProvideMapMixin' | ||
|
||
export class ImageLayer extends mixin(ol.layer.Image, LayerLoadProcessCountMixin) { | ||
/** | ||
* @param {G4UMap} map | ||
*/ | ||
setMap (map) { | ||
/** | ||
* WORKAROUND | ||
* As openlayers identifies managed layers (i.e. layers that are registered via the maps addLayer function) | ||
* by the fact that the setMap method was called and we need a reference to the map in layers contained in a | ||
* grouplayer, we overwrite the setMap method to still have access to the map via the normal way | ||
* @type {G4UMap} | ||
* @private | ||
*/ | ||
this.map__ = map | ||
} | ||
|
||
/** | ||
* @returns {G4UMap} | ||
*/ | ||
getMap () { | ||
return this.map__ | ||
} | ||
} | ||
|
||
export class BaseLayerImage extends mixin(ImageLayer, BaseLayerMixin) { | ||
|
||
} | ||
export const ImageLayer = mixin(mixin(ol.layer.Image, ProvideMapMixin), LayerLoadProcessCountMixin) | ||
|
||
export const BaseLayerImage = mixin(ImageLayer, BaseLayerMixin) |
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,19 @@ | ||
export class ProvideMapMixin { | ||
/** | ||
* @param {G4UMap} map | ||
*/ | ||
provideMap (map) { | ||
/** | ||
* @type {G4UMap|undefined} | ||
* @private | ||
*/ | ||
this.providedMap_ = map | ||
} | ||
|
||
/** | ||
* @returns {G4UMap|undefined} | ||
*/ | ||
getProvidedMap () { | ||
return this.providedMap_ | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(as example for many:) The use of spaces in brackets is very inconsistent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
http://eslint.org/docs/rules/space-in-brackets on "never"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See standard/standard#609
space-in-brackets was removed with ESLint 1.0.