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.

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

#6933: Enhance IconSymbolizer and Contrast enhancement #1

Merged
merged 2 commits into from
Aug 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,30 @@
},
"gammaValue": {
"type": "number"
},
"vendorOption": {
"$ref": "http://geostyler/geostyler-style.json#/definitions/ContrastEnhancementVendorOption",
"description": "A ContrastEnhancementVendorOption defines the algorithm to apply for Normalize contrast enhancement."
}
},
"type": "object"
},
"ContrastEnhancementVendorOption": {
"description": "A ContrastEnhancementVendorOption defines the algorithm to apply for Normalize contrast enhancement.",
"properties": {
"algorithm": {
"enum": [
"ClipToMinimumMaximum",
"ClipToZero",
"StretchToMinimumMaximum"
],
"type": "string"
},
"maxValue": {
"type": "number"
},
"minValue": {
"type": "number"
}
},
"type": "object"
Expand Down Expand Up @@ -300,6 +324,17 @@
"description": "A color defined as a hex-color string.",
"type": "string"
},
"format": {
"description": "The format (MIME type) of the image provided.",
"enum": [
"image/gif",
"image/jpeg",
"image/jpg",
"image/png",
"image/svg+xml"
],
"type": "string"
},
"haloBlur": {
"description": "The halo's fadeout distance towards the outside.",
"type": "number"
Expand Down
14 changes: 14 additions & 0 deletions style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,10 @@ export interface IconSymbolizer extends BasePointSymbolizer {
* A path/URL to the icon image file.
*/
image?: string;
/**
* The format (MIME type) of the image provided.
*/
format?: `image/${'png' | 'jpg' | 'jpeg' | 'gif' | 'svg+xml'}`;
/**
* If true, the icon will be kept upright.
*/
Expand Down Expand Up @@ -549,12 +553,22 @@ export interface ColorMap {
extended?: boolean;
}

/**
* A ContrastEnhancementVendorOption defines the algorithm to apply for Normalize contrast enhancement.
*/
export interface ContrastEnhancementVendorOption {
algorithm: 'StretchToMinimumMaximum' | 'ClipToMinimumMaximum' | 'ClipToZero';
minValue?: number;
maxValue?: number;
}

/**
* A ContrastEnhancement defines how the contrast of image data should be enhanced.
*/
export interface ContrastEnhancement {
enhancementType?: 'normalize' | 'histogram';
gammaValue?: number;
vendorOption?: ContrastEnhancementVendorOption;
}

/**
Expand Down