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

Fix. If the color defined in the entity is 256, the color used should be the one defined in the layer #104

Merged
merged 1 commit into from
Aug 29, 2022
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
3 changes: 2 additions & 1 deletion src/getRGBForEntity.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import logger from './util/logger'
export default (layers, entity) => {
const layerTable = layers[entity.layer]
if (layerTable) {
const colorNumber = ('colorNumber' in entity) ? entity.colorNumber : layerTable.colorNumber
const colorDefinedInEntity = ('colorNumber' in entity && entity.colorNumber !== 256)
const colorNumber = colorDefinedInEntity ? entity.colorNumber : layerTable.colorNumber
const rgb = colors[colorNumber]
if (rgb) {
return rgb
Expand Down
18 changes: 18 additions & 0 deletions test/unit/colorbylayer.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import expect from 'expect'

import getRGBForEntity from '../../src/getRGBForEntity'

describe('colors', () => {
it('Color defined in the entity but with value 256 means that we have to use the color defined in the layer.', () => {
const fakeEntity = {
layer: "0",
colorNumber: 256
};
const fakeLayers = {
"0": {
colorNumber: 1
}
}
expect(getRGBForEntity(fakeLayers, fakeEntity)).toEqual([255, 0, 0])
})
})